summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)Author
2007-12-06Merge branch 'maint'Junio C Hamano
2007-12-06git-am -i: report rewritten titleJunio C Hamano
2007-12-05Revert "git-am: catch missing author date early."Junio C Hamano
2007-12-02git-am: catch missing author date early.Junio C Hamano
2007-11-29Merge branch 'maint'Junio C Hamano
2007-11-29scripts: do not get confused with HEAD in work treeJunio C Hamano
2007-11-09git-am: -i does not take a string parameter.Junio C Hamano
2007-11-06Give git-am back the ability to add Signed-off-by lines.Johannes Sixt
2007-11-06Migrate git-am.sh to use git-rev-parse --parseoptPierre Habouzit
2007-10-18Merge branch 'jc/am-quiet'Shawn O. Pearce
2007-10-03Merge branch 'jc/autogc'Junio C Hamano
2007-10-01git-am: fix typo in the previous one.Junio C Hamano
2007-09-30git-am: make the output quieter.Junio C Hamano
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin
2007-09-24Merge branch 'js/apply-build-ancestor'Junio C Hamano
2007-09-23Supplant the "while case ... break ;; esac" idiomDavid Kastrup
2007-09-19apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin
2007-09-06Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano
2007-08-26Make usage documentation for git-am consistent.Brian Hetro
2007-08-06git-am: initialize variable $resume on startupGerrit Pape
2007-07-25git am: skip pine's internal folder dataJohannes Schindelin
2007-07-20Add GIT_EDITOR environment and core.editor configuration variablesAdam Roben
2007-07-07Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-05-26More echo "$user_message" fixes.Jeff King
2007-05-26git-am: use printf instead of echo on user-supplied stringsJeff King
2007-04-24Fix typo in git-am: s/Was is/Was it/Josh Triplett
2007-03-25Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen
2007-03-13builtin-mailinfo.c infrastrcture changesDon Zickus
2007-02-24Reword git-am 3-way fallback failure message.Junio C Hamano
2007-02-12Teach git-am to pass -p option down to git-applyJunio C Hamano
2007-02-08add -C[NUM] to git-amMichael S. Tsirkin
2007-01-12Merge branch 'jc/bare'Junio C Hamano
2007-01-10Disallow working directory commands in a bare repository.Shawn O. Pearce
2007-01-10-u is now default for 'git-mailinfo'.Junio C Hamano
2007-01-10git-am: should work when "--no-utf8 --utf8" is givenJunio C Hamano
2007-01-08--utf8 is now default for 'git-am'Junio C Hamano
2006-12-29Use merge-recursive in git-am -3.Shawn O. Pearce
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce
2006-12-22Suggest 'add' in am/revert/cherry-pick.Shawn O. Pearce
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong
2006-09-16Fix git-am safety checksJunio C Hamano
2006-08-13git-am: give better diagnostics when the patch does not apply during --3wayJunio C Hamano
2006-07-24git-am: Don't accept an mbox on stdin of we already have a .dotest directoryLukas Sandström
2006-07-14Record rebase changes as 'rebase' in the reflog.Shawn Pearce
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-06-27Fix expr usage for FreeBSDDennis Stosberg
2006-05-23Merge branch 'sp/reflog' into nextJunio C Hamano
2006-05-19Include ref log detail in commit, reset, etc.Shawn Pearce
2006-05-16Merge branch 'jc/apply' into nextJunio C Hamano