aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2007-11-28
|\
| * scripts: do not get confused with HEAD in work treeJunio C Hamano2007-11-28
| * apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-26
* | git-am: -i does not take a string parameter.Junio C Hamano2007-11-08
* | Give git-am back the ability to add Signed-off-by lines.Johannes Sixt2007-11-06
* | Migrate git-am.sh to use git-rev-parse --parseoptPierre Habouzit2007-11-05
* | Merge branch 'jc/am-quiet'Shawn O. Pearce2007-10-18
|\ \
| * | git-am: fix typo in the previous one.Junio C Hamano2007-10-01
| * | git-am: make the output quieter.Junio C Hamano2007-09-29
* | | Merge branch 'jc/autogc'Junio C Hamano2007-10-03
|\ \ \ | |/ / |/| |
| * | Invoke "git gc --auto" from commit, merge, am and rebase.Junio C Hamano2007-09-06
* | | Merge branch 'js/apply-build-ancestor'Junio C Hamano2007-09-23
|\ \ \ | |_|/ |/| |
| * | apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-18
| |/
* | Supplant the "while case ... break ;; esac" idiomDavid Kastrup2007-09-23
|/
* Make usage documentation for git-am consistent.Brian Hetro2007-08-25
* git-am: initialize variable $resume on startupGerrit Pape2007-08-06
* git am: skip pine's internal folder dataJohannes Schindelin2007-07-24
* Add GIT_EDITOR environment and core.editor configuration variablesAdam Roben2007-07-20
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-06
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* More echo "$user_message" fixes.Jeff King2007-05-26
* git-am: use printf instead of echo on user-supplied stringsJeff King2007-05-25
* 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