projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adc3b2b
)
i18n: git-am add git-sh-i18n
author
Ævar Arnfjörð Bjarmason
<avarab@gmail.com>
Sat, 21 May 2011 18:43:42 +0000
(18:43 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 21 May 2011 18:57:13 +0000
(11:57 -0700)
Source git-sh-i18n in git-am.sh, it's needed to import the Git gettext
shell functions.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh
patch
|
blob
|
history
diff --git
a/git-am.sh
b/git-am.sh
index 6cdd5910db50c96df3d149fba172750cb10c09cb..79c5ea2a573fa5c70a1396b96af34fa221f5d6b8 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-37,6
+37,7
@@
rerere-autoupdate update the index with reused conflict resolution if possible
rebasing* (internal use for git-rebase)"
. git-sh-setup
+. git-sh-i18n
prefix=$(git rev-parse --show-prefix)
set_reflog_action am
require_work_tree