summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)Author
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
2006-05-16git-am: use apply --cachedJunio C Hamano
2006-05-14Make git rebase interactive help match documentation.Sean
2006-05-02Give the user a hint for how to continue in the case that git-am fails becaus...Robert Shearman
2006-04-28git-am --resolved: more usable error message.Junio C Hamano
2006-03-02war on whitespaces: documentation.Junio C Hamano
2006-03-01git-am: --whitespace=x option.Junio C Hamano
2006-02-24git-am: do not allow empty commits by mistake.Junio C Hamano
2006-02-22Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano
2006-02-12Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano
2006-02-07git-rerere: reuse recorded resolve.Junio C Hamano
2005-12-17Fix git-am --skipJan Harkes
2005-12-15mailinfo and git-am: allow "John Doe <johndoe>"Junio C Hamano
2005-12-14Merge branch 'hold/am'Junio C Hamano
2005-12-14git-am: Usage string clean-upfreku045@student.liu.se
2005-12-14git-am support for naked email messages (take 2)H. Peter Anvin
2005-12-07Use printf rather than echo -n.Jason Riedy
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
2005-11-18git-am: --binary; document --resume and --binary.Junio C Hamano
2005-11-17git-am: --resolved.Junio C Hamano
2005-11-08git-am: do not lose already edited final-commit when resuming.Junio C Hamano
2005-10-26Add [v]iew patch in git-am interactive.Junio C Hamano
2005-10-26git-am: make it easier after fixing up an unapplicable patch.Junio C Hamano
2005-10-21Fix missing exports in git-amJunio C Hamano
2005-10-18Update git-apply to use C-style quoting for funny pathnames.Junio C Hamano
2005-10-13git-am: do not fail if 3-way fallback succeeds.Junio C Hamano
2005-10-13git-am: interactive should fail gracefully.Junio C Hamano
2005-10-07Add git-am, applymbox replacement.Junio C Hamano