aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAge
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Merge branch 'ar/mergestat'Junio C Hamano2007-05-29
|\
| * Add a configuration option to control diffstat after mergeAlex Riesen2007-05-24
* | Merge branch 'maint'Junio C Hamano2007-05-26
|\ \ | |/ |/|
| * Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-26
| |\
| | * More echo "$user_message" fixes.Jeff King2007-05-26
* | | Add colour support in rebase and merge tree diff stats output.James Bowes2007-05-10
|/ /
* | A new merge stragety 'subtree'.Junio C Hamano2007-04-07
|/
* git-merge: Put FETCH_HEAD data in merge commit messageMichael S. Tsirkin2007-03-22
* git-merge: finish when git-read-tree failsSanti Béjar2007-03-16
* git-merge: warn when -m provided on a fast forwardJ. Bruce Fields2007-03-11
* git-merge: fail correctly when we cannot fast forward.Junio C Hamano2007-03-03
* git-merge: minor fix for no_trivial_merge_strategies.Junio C Hamano2007-02-16
* [PATCH] Rename git-repo-config to git-config.Tom Prince2007-01-28
* git-merge: leave sensible reflog message when used as the first level UI.Junio C Hamano2007-01-26
* Merge branch 'sp/merge' (early part)Junio C Hamano2007-01-14
|\
| * Improve merge performance by avoiding in-index merges.Shawn O. Pearce2007-01-10
* | Allow whole-tree operations to be started from a subdirectoryJunio C Hamano2007-01-12
* | Disallow working directory commands in a bare repository.Shawn O. Pearce2007-01-10
|/
* fail pull/merge early in the middle of conflicted mergeJunio C Hamano2007-01-01
* Honor pull.{twohead,octopus} in git-merge.Shawn O. Pearce2006-12-28
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-28
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-23
* merge and reset: adjust for "reset --hard" messagesJunio C Hamano2006-12-22
* merge: give a bit prettier merge message to "merge branch~$n"Junio C Hamano2006-12-16
* Merge branch 'jc/read-tree-ignore'Junio C Hamano2006-12-13
|\
| * Loosen "working file will be lost" check in Porcelain-ishJunio C Hamano2006-12-05
* | git merge: reword failure message.Junio C Hamano2006-12-13
* | git-merge: fix "fix confusion between tag and branch" for realJunio C Hamano2006-12-06
* | git-merge: squelch needless error message.Junio C Hamano2006-12-06
|/
* git-merge: fix confusion between tag and branchJunio C Hamano2006-12-02
* git-merge: do not leak rev-parse output used for checking internally.Junio C Hamano2006-11-26
* git-merge: tighten error checking.Junio C Hamano2006-11-26
* merge: allow merging into a yet-to-be-born branch.Junio C Hamano2006-11-21
* git-merge: make it usable as the first class UIJunio C Hamano2006-11-21
* remove merge-recursive-oldJunio C Hamano2006-11-21
* Merge branch 'maint'Junio C Hamano2006-10-22
|\
| * git-merge: show usage if run without argumentsRene Scharfe2006-10-22
* | merge and resolve: Output short hashes and .. in "Updating ..."Santi Béjar2006-09-30
|/
* Deprecate merge-recursive.pyJunio C Hamano2006-09-24
* Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-30
|\
| * Log ref changes made by git-merge and git-pull.Shawn Pearce2006-07-11
* | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-13
* | Status update on merge-recursive in CJohannes Schindelin2006-07-13
|/
* Fix expr usage for FreeBSDDennis Stosberg2006-06-27
* git-merge --squashJunio C Hamano2006-06-24
* git-merge: Don't use -p when outputting summaryTimo Hirvonen2006-06-23
* Convert some "apply --summary" users to "diff --summary".Sean2006-05-14
* git-merge: a bit more readable user guidance.Junio C Hamano2006-04-19
* git-merge knows some strategies want to skip trivial mergesJunio C Hamano2006-03-20
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 03:29:21 +0000