aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAge
* Fix typo in git-am: s/Was is/Was it/Josh Triplett2007-04-23
* Use diff* with --exit-code in git-am, git-rebase and git-merge-oursAlex Riesen2007-03-24
* builtin-mailinfo.c infrastrcture changesDon Zickus2007-03-12
* Reword git-am 3-way fallback failure message.Junio C Hamano2007-02-24
* Teach git-am to pass -p option down to git-applyJunio C Hamano2007-02-11
* add -C[NUM] to git-amMichael S. Tsirkin2007-02-08
* Merge branch 'jc/bare'Junio C Hamano2007-01-11
|\
| * Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-10
* | -u is now default for 'git-mailinfo'.Junio C Hamano2007-01-09
* | git-am: should work when "--no-utf8 --utf8" is givenJunio C Hamano2007-01-09
* | --utf8 is now default for 'git-am'Junio C Hamano2007-01-08
|/
* Use merge-recursive in git-am -3.Shawn O. Pearce2006-12-28
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-28
* Suggest 'add' in am/revert/cherry-pick.Shawn O. Pearce2006-12-21
* rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong2006-12-09
* Fix git-am safety checksJunio C Hamano2006-09-16
* git-am: give better diagnostics when the patch does not apply during --3wayJunio C Hamano2006-08-12
* git-am: Don't accept an mbox on stdin of we already have a .dotest directoryLukas Sandström2006-07-23
* Record rebase changes as 'rebase' in the reflog.Shawn Pearce2006-07-13
* Fix more typos, primarily in the codePavel Roskin2006-07-10
* Fix expr usage for FreeBSDDennis Stosberg2006-06-27
* Merge branch 'sp/reflog' into nextJunio C Hamano2006-05-23
|\
| * Include ref log detail in commit, reset, etc.Shawn Pearce2006-05-19
* | Merge branch 'jc/apply' into nextJunio C Hamano2006-05-15
|\ \ | |/ |/|
| * git-am: use apply --cachedJunio C Hamano2006-05-15
* | Make git rebase interactive help match documentation.Sean2006-05-14
|/
* Give the user a hint for how to continue in the case that git-am fails becaus...Robert Shearman2006-05-02
* git-am --resolved: more usable error message.Junio C Hamano2006-04-28
* war on whitespaces: documentation.Junio C Hamano2006-03-02
* git-am: --whitespace=x option.Junio C Hamano2006-02-28
* git-am: do not allow empty commits by mistake.Junio C Hamano2006-02-23
* Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-22
* Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano2006-02-11
* git-rerere: reuse recorded resolve.Junio C Hamano2006-02-06
* Fix git-am --skipJan Harkes2005-12-16
* mailinfo and git-am: allow "John Doe <johndoe>"Junio C Hamano2005-12-14
* Merge branch 'hold/am'Junio C Hamano2005-12-14
|\
| * git-am support for naked email messages (take 2)H. Peter Anvin2005-12-14
* | git-am: Usage string clean-upfreku045@student.liu.se2005-12-14
|/
* Use printf rather than echo -n.Jason Riedy2005-12-06
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-25
* git-am: --binary; document --resume and --binary.Junio C Hamano2005-11-17
* git-am: --resolved.Junio C Hamano2005-11-16
* git-am: do not lose already edited final-commit when resuming.Junio C Hamano2005-11-08
* Add [v]iew patch in git-am interactive.Junio C Hamano2005-10-25
* git-am: make it easier after fixing up an unapplicable patch.Junio C Hamano2005-10-25
* Fix missing exports in git-amJunio C Hamano2005-10-20
* Update git-apply to use C-style quoting for funny pathnames.Junio C Hamano2005-10-17
* git-am: do not fail if 3-way fallback succeeds.Junio C Hamano2005-10-13
* git-am: interactive should fail gracefully.Junio C Hamano2005-10-12