index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-am.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2015-07-24
Revert "git-am: add am.threeWay config variable"
Junio C Hamano
1
-9
/
+0
2015-06-24
Merge branch 'pt/am-abort-fix'
Junio C Hamano
1
-8
/
+23
2015-06-24
Merge branch 'rl/am-3way-config'
Junio C Hamano
1
-0
/
+10
2015-06-08
am --abort: keep unrelated commits on unborn branch
Paul Tan
1
-1
/
+1
2015-06-08
am --abort: support aborting to unborn branch
Paul Tan
1
-1
/
+8
2015-06-08
am --abort: revert changes introduced by failed 3way merge
Paul Tan
1
-1
/
+5
2015-06-08
am --skip: support skipping while on unborn branch
Paul Tan
1
-3
/
+1
2015-06-08
am -3: support 3way merge on unborn branch
Paul Tan
1
-1
/
+2
2015-06-08
am --skip: revert changes introduced by failed 3way merge
Paul Tan
1
-1
/
+6
2015-06-04
git-am: add am.threeWay config variable
Remi Lespinet
1
-0
/
+9
2015-06-04
git-am.sh: fix initialization of the threeway variable
Remi Lespinet
1
-0
/
+1
2015-05-11
Merge branch 'nd/multiple-work-trees'
Junio C Hamano
1
-11
/
+11
2014-12-01
*.sh: avoid hardcoding $GIT_DIR/hooks/...
Nguyễn Thái Ngọc Duy
1
-11
/
+11
2014-11-25
git-am: add --message-id/--no-message-id
Paolo Bonzini
1
-2
/
+19
2014-04-08
Merge branch 'jl/nor-or-nand-and'
Junio C Hamano
1
-1
/
+1
2014-03-31
comments: fix misuses of "nor"
Justin Lebar
1
-1
/
+1
2014-03-25
git-am.sh: use the $(...) construct for command substitution
Elia Pinto
1
-15
/
+15
2014-02-03
am: add the --gpg-sign option
Nicolas Vigier
1
-1
/
+8
2014-02-03
am: parse options in stuck-long mode
Nicolas Vigier
1
-9
/
+9
2014-02-03
git-sh-setup.sh: add variable to use the stuck-long mode
Nicolas Vigier
1
-0
/
+1
2013-12-05
Merge branch 'jk/replace-perl-in-built-scripts'
Junio C Hamano
1
-2
/
+2
2013-10-29
use @@PERL@@ in built scripts
Jeff King
1
-2
/
+2
2013-06-27
am: replace uses of --resolved with --continue
Kevin Bracey
1
-4
/
+4
2013-06-17
am: handle stray $dotest directory
Ramkumar Ramachandra
1
-0
/
+17
2013-05-12
am: return control to caller, for housekeeping
Ramkumar Ramachandra
1
-2
/
+7
2013-05-12
am: tighten a conditional that checks for $dotest
Ramkumar Ramachandra
1
-1
/
+3
2013-03-21
git-am: show the final log message on "Applying:" indicator
Simon Ruderich
1
-7
/
+7
2013-02-05
Merge branch 'jc/fake-ancestor-with-non-blobs'
Junio C Hamano
1
-1
/
+1
2013-01-31
git-am: record full index line in the patch used while rebasing
Junio C Hamano
1
-1
/
+1
2013-01-28
Merge branch 'dl/am-hg-locale'
Junio C Hamano
1
-1
/
+1
2013-01-18
am: invoke perl's strftime in C locale
Dmitry V. Levin
1
-1
/
+1
2012-09-07
Merge branch 'nd/am-i18n-fix'
Junio C Hamano
1
-2
/
+2
2012-08-22
am: quote string for translation before passing to eval_gettextln
Nguyễn Thái Ngọc Duy
1
-2
/
+2
2012-07-31
Merge branch 'jx/i18n-1.7.11'
Junio C Hamano
1
-12
/
+8
2012-07-26
Remove dead code which contains bad gettext block
Jiang Xin
1
-3
/
+0
2012-07-26
i18n: am: mark more strings for translation
Jiang Xin
1
-6
/
+5
2012-07-25
i18n: rebase: mark messages for translation
Jiang Xin
1
-3
/
+3
2012-07-22
Merge branch 'pg/maint-1.7.9-am-where-is-patch'
Junio C Hamano
1
-0
/
+5
2012-07-13
am: indicate where a failed patch is to be found
Paul Gortmaker
1
-0
/
+5
2012-06-26
am: don't call mailinfo if $rebasing
Martin von Zweigbergk
1
-23
/
+24
2012-06-26
am --rebasing: get patch body from commit, not from mailbox
Martin von Zweigbergk
1
-0
/
+1
2012-04-20
Merge branch 'jc/am-report-3way'
Junio C Hamano
1
-0
/
+6
2012-04-20
Merge branch 'jb/am-include'
Junio C Hamano
1
-1
/
+2
2012-03-28
am: support --include option
Johannes Berg
1
-1
/
+2
2012-03-28
am -3: list the paths that needed 3-way fallback
Junio C Hamano
1
-0
/
+6
2012-03-13
am: officially deprecate -b/--binary option
Junio C Hamano
1
-2
/
+2
2012-03-12
Merge branch 'jc/am-3-nonstandard-popt' into maint
Junio C Hamano
1
-4
/
+7
2012-03-12
git-am: error out when seeing -b/--binary
Thomas Rast
1
-1
/
+3
2012-03-04
Merge branch 'jc/am-3-nonstandard-popt'
Junio C Hamano
1
-4
/
+7
2012-02-26
Merge branch 'maint'
Junio C Hamano
1
-1
/
+1
[next]