summaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-4/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-36/+36
* Merge branch 'ar/mergestat'Junio C Hamano2007-05-291-6/+12
|\
| * Add a configuration option to control diffstat after mergeAlex Riesen2007-05-241-6/+12
* | Merge branch 'maint'Junio C Hamano2007-05-261-3/+3
|\ \ | |/ |/|
| * Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-261-3/+3
| |\
| | * More echo "$user_message" fixes.Jeff King2007-05-261-3/+3
* | | Add colour support in rebase and merge tree diff stats output.James Bowes2007-05-101-1/+2
|/ /
* | A new merge stragety 'subtree'.Junio C Hamano2007-04-071-2/+2
|/
* git-merge: Put FETCH_HEAD data in merge commit messageMichael S. Tsirkin2007-03-221-0/+4
* git-merge: finish when git-read-tree failsSanti Béjar2007-03-161-2/+2
* git-merge: warn when -m provided on a fast forwardJ. Bruce Fields2007-03-111-1/+6
* git-merge: fail correctly when we cannot fast forward.Junio C Hamano2007-03-031-1/+1
* git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano2007-02-161-6/+9
* [PATCH] Rename git-repo-config to git-config.Tom Prince2007-01-281-2/+2
* git-merge: leave sensible reflog message when used as the first level UI.Junio C Hamano2007-01-261-1/+1
* Merge branch 'sp/merge' (early part)Junio C Hamano2007-01-141-17/+23
|\
| * Improve merge performance by avoiding in-index merges.Shawn O. Pearce2007-01-101-17/+23
* | Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-121-1/+3
* | Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-101-0/+1
|/
* fail pull/merge early in the middle of conflicted mergeJunio C Hamano2007-01-011-0/+3
* Honor pull.{twohead,octopus} in git-merge.Shawn O. Pearce2006-12-281-2/+14
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-8/+5
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-231-0/+2
* merge and reset: adjust for "reset --hard" messagesJunio C Hamano2006-12-221-1/+1
* merge: give a bit prettier merge message to "merge branch~$n"Junio C Hamano2006-12-161-9/+17
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-131-1/+1
|\
| * Loosen "working file will be lost" check in Porcelain-ishJunio C Hamano2006-12-051-1/+1
* | git merge: reword failure message.Junio C Hamano2006-12-131-1/+8
* | git-merge: fix "fix confusion between tag and branch" for realJunio C Hamano2006-12-061-2/+3
* | git-merge: squelch needless error message.Junio C Hamano2006-12-061-1/+1
|/
* git-merge: fix confusion between tag and branchJunio C Hamano2006-12-021-5/+5
* git-merge: do not leak rev-parse output used for checking internally.Junio C Hamano2006-11-261-1/+1
* git-merge: tighten error checking.Junio C Hamano2006-11-261-3/+3
* merge: allow merging into a yet-to-be-born branch.Junio C Hamano2006-11-211-0/+18
* git-merge: make it usable as the first class UIJunio C Hamano2006-11-211-7/+54
* remove merge-recursive-oldJunio C Hamano2006-11-211-4/+1
* Merge branch 'maint'Junio C Hamano2006-10-221-0/+2
|\
| * git-merge: show usage if run without argumentsRene Scharfe2006-10-221-0/+2
* | merge and resolve: Output short hashes and .. in "Updating ..."Santi Béjar2006-09-301-1/+1
|/
* Deprecate merge-recursive.pyJunio C Hamano2006-09-241-13/+3
* Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-301-3/+14
|\
| * Log ref changes made by git-merge and git-pull.Shawn Pearce2006-07-111-3/+14
* | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-131-2/+11
* | Status update on merge-recursive in CJohannes Schindelin2006-07-131-3/+3
|/
* Fix expr usage for FreeBSDDennis Stosberg2006-06-271-1/+1
* git-merge --squashJunio C Hamano2006-06-241-19/+53
* git-merge: Don't use -p when outputting summaryTimo Hirvonen2006-06-231-1/+1
* Convert some "apply --summary" users to "diff --summary".Sean2006-05-141-2/+1
* git-merge: a bit more readable user guidance.Junio C Hamano2006-04-191-1/+1
View Lorry Controller Status