summaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAgeFilesLines
* Teach git-am to pass -p option down to git-applyJunio C Hamano2007-02-111-5/+2
* add -C[NUM] to git-amMichael S. Tsirkin2007-02-081-4/+8
* Merge branch 'jc/bare'Junio C Hamano2007-01-111-0/+1
|\
| * Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-101-0/+1
* | -u is now default for 'git-mailinfo'.Junio C Hamano2007-01-091-0/+2
* | git-am: should work when "--no-utf8 --utf8" is givenJunio C Hamano2007-01-091-1/+1
* | --utf8 is now default for 'git-am'Junio C Hamano2007-01-081-3/+5
|/
* Use merge-recursive in git-am -3.Shawn O. Pearce2006-12-281-2/+5
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-5/+2
* Suggest 'add' in am/revert/cherry-pick.Shawn O. Pearce2006-12-211-2/+2
* rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/amEric Wong2006-12-091-0/+8
* Fix git-am safety checksJunio C Hamano2006-09-161-4/+19
* git-am: give better diagnostics when the patch does not apply during --3wayJunio C Hamano2006-08-121-9/+19
* git-am: Don't accept an mbox on stdin of we already have a .dotest directoryLukas Sandström2006-07-231-2/+4
* Record rebase changes as 'rebase' in the reflog.Shawn Pearce2006-07-131-1/+5
* Fix more typos, primarily in the codePavel Roskin2006-07-101-1/+1
* Fix expr usage for FreeBSDDennis Stosberg2006-06-271-1/+1
* Merge branch 'sp/reflog' into nextJunio C Hamano2006-05-231-1/+1
|\
| * Include ref log detail in commit, reset, etc.Shawn Pearce2006-05-191-1/+1
* | Merge branch 'jc/apply' into nextJunio C Hamano2006-05-151-36/+2
|\ \ | |/ |/|
| * git-am: use apply --cachedJunio C Hamano2006-05-151-36/+2
* | Make git rebase interactive help match documentation.Sean2006-05-141-2/+9
|/
* Give the user a hint for how to continue in the case that git-am fails becaus...Robert Shearman2006-05-021-3/+23
* git-am --resolved: more usable error message.Junio C Hamano2006-04-281-0/+7
* war on whitespaces: documentation.Junio C Hamano2006-03-021-1/+2
* git-am: --whitespace=x option.Junio C Hamano2006-02-281-4/+9
* git-am: do not allow empty commits by mistake.Junio C Hamano2006-02-231-2/+8
* Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-221-1/+3
* Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano2006-02-111-1/+4
* git-rerere: reuse recorded resolve.Junio C Hamano2006-02-061-0/+1
* Fix git-am --skipJan Harkes2005-12-161-0/+2
* mailinfo and git-am: allow "John Doe <johndoe>"Junio C Hamano2005-12-141-0/+7
* Merge branch 'hold/am'Junio C Hamano2005-12-141-4/+1
|\
| * git-am support for naked email messages (take 2)H. Peter Anvin2005-12-141-4/+1
* | git-am: Usage string clean-upfreku045@student.liu.se2005-12-141-7/+3
|/
* Use printf rather than echo -n.Jason Riedy2005-12-061-1/+1
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-251-1/+1
* git-am: --binary; document --resume and --binary.Junio C Hamano2005-11-171-6/+14
* git-am: --resolved.Junio C Hamano2005-11-161-12/+53
* git-am: do not lose already edited final-commit when resuming.Junio C Hamano2005-11-081-12/+19
* Add [v]iew patch in git-am interactive.Junio C Hamano2005-10-251-5/+8
* git-am: make it easier after fixing up an unapplicable patch.Junio C Hamano2005-10-251-4/+10
* Fix missing exports in git-amJunio C Hamano2005-10-201-0/+1
* Update git-apply to use C-style quoting for funny pathnames.Junio C Hamano2005-10-171-2/+2
* git-am: do not fail if 3-way fallback succeeds.Junio C Hamano2005-10-131-8/+12
* git-am: interactive should fail gracefully.Junio C Hamano2005-10-121-2/+2
* Add git-am, applymbox replacement.Junio C Hamano2005-10-071-0/+337
View Lorry Controller Status