summaryrefslogtreecommitdiff
path: root/git-am.sh
AgeCommit message (Expand)AuthorFilesLines
2007-01-11Merge branch 'jc/bare'Libravatar Junio C Hamano1-0/+1
2007-01-10Disallow working directory commands in a bare repository.Libravatar Shawn O. Pearce1-0/+1
2007-01-09-u is now default for 'git-mailinfo'.Libravatar Junio C Hamano1-0/+2
2007-01-09git-am: should work when "--no-utf8 --utf8" is givenLibravatar Junio C Hamano1-1/+1
2007-01-08--utf8 is now default for 'git-am'Libravatar Junio C Hamano1-3/+5
2006-12-28Use merge-recursive in git-am -3.Libravatar Shawn O. Pearce1-2/+5
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Libravatar Shawn O. Pearce1-5/+2
2006-12-21Suggest 'add' in am/revert/cherry-pick.Libravatar Shawn O. Pearce1-2/+2
2006-12-09rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amLibravatar Eric Wong1-0/+8
2006-09-16Fix git-am safety checksLibravatar Junio C Hamano1-4/+19
2006-08-12git-am: give better diagnostics when the patch does not apply during --3wayLibravatar Junio C Hamano1-9/+19
2006-07-23git-am: Don't accept an mbox on stdin of we already have a .dotest directoryLibravatar Lukas Sandström1-2/+4
2006-07-13Record rebase changes as 'rebase' in the reflog.Libravatar Shawn Pearce1-1/+5
2006-07-10Fix more typos, primarily in the codeLibravatar Pavel Roskin1-1/+1
2006-06-27Fix expr usage for FreeBSDLibravatar Dennis Stosberg1-1/+1
2006-05-23Merge branch 'sp/reflog' into nextLibravatar Junio C Hamano1-1/+1
2006-05-19Include ref log detail in commit, reset, etc.Libravatar Shawn Pearce1-1/+1
2006-05-15Merge branch 'jc/apply' into nextLibravatar Junio C Hamano1-36/+2
2006-05-15git-am: use apply --cachedLibravatar Junio C Hamano1-36/+2
2006-05-14Make git rebase interactive help match documentation.Libravatar Sean1-2/+9
2006-05-02Give the user a hint for how to continue in the case that git-am fails becaus...Libravatar Robert Shearman1-3/+23
2006-04-28git-am --resolved: more usable error message.Libravatar Junio C Hamano1-0/+7
2006-03-02war on whitespaces: documentation.Libravatar Junio C Hamano1-1/+2
2006-02-28git-am: --whitespace=x option.Libravatar Junio C Hamano1-4/+9
2006-02-23git-am: do not allow empty commits by mistake.Libravatar Junio C Hamano1-2/+8
2006-02-22Keep Porcelainish from failing by broken ident after making changes.Libravatar Junio C Hamano1-1/+3
2006-02-11Only call git-rerere if $GIT_DIR/rr-cache exists.Libravatar Junio C Hamano1-1/+4
2006-02-06git-rerere: reuse recorded resolve.Libravatar Junio C Hamano1-0/+1
2005-12-16Fix git-am --skipLibravatar Jan Harkes1-0/+2
2005-12-14mailinfo and git-am: allow "John Doe <johndoe>"Libravatar Junio C Hamano1-0/+7
2005-12-14Merge branch 'hold/am'Libravatar Junio C Hamano1-4/+1
2005-12-14git-am: Usage string clean-upLibravatar freku045@student.liu.se1-7/+3
2005-12-14git-am support for naked email messages (take 2)Libravatar H. Peter Anvin1-4/+1
2005-12-06Use printf rather than echo -n.Libravatar Jason Riedy1-1/+1
2005-11-25git-sh-setup: die if outside git repository.Libravatar Junio C Hamano1-1/+1
2005-11-17git-am: --binary; document --resume and --binary.Libravatar Junio C Hamano1-6/+14
2005-11-16git-am: --resolved.Libravatar Junio C Hamano1-12/+53
2005-11-08git-am: do not lose already edited final-commit when resuming.Libravatar Junio C Hamano1-12/+19
2005-10-25Add [v]iew patch in git-am interactive.Libravatar Junio C Hamano1-5/+8
2005-10-25git-am: make it easier after fixing up an unapplicable patch.Libravatar Junio C Hamano1-4/+10
2005-10-20Fix missing exports in git-amLibravatar Junio C Hamano1-0/+1
2005-10-17Update git-apply to use C-style quoting for funny pathnames.Libravatar Junio C Hamano1-2/+2
2005-10-13git-am: do not fail if 3-way fallback succeeds.Libravatar Junio C Hamano1-8/+12
2005-10-12git-am: interactive should fail gracefully.Libravatar Junio C Hamano1-2/+2
2005-10-07Add git-am, applymbox replacement.Libravatar Junio C Hamano1-0/+337
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 22:48:01 +0000