aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAge
* 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
* allow double click on current HEAD id after git-pullOlaf Hering2006-03-09
* Merge fixes early for next maint series.Junio C Hamano2006-02-23
|\
| * checkout - eye candy.Junio C Hamano2006-02-22
| * Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-22
* | Merge part of jc/portable branchJunio C Hamano2006-02-21
|\ \
| * | Optionally work without pythonJohannes Schindelin2006-02-18
| |/
* | Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-18
|/
* 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
* git-merge: Properly quote $merge_msg variable.Junio C Hamano2006-02-03
* merge: seed the commit message with list of conflicted files.Junio C Hamano2006-01-27
* merge --no-commit: tweak messageJunio C Hamano2005-12-23
* Trivial usage string clean-upfreku045@student.liu.se2005-12-14
* [PATCH] allow merging any committishJunio C Hamano2005-12-13
* git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen2005-12-03
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-25
* git-merge: make recursive the default strategyJunio C Hamano2005-11-23
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-09
* Add 'ours' merge strategy.Junio C Hamano2005-11-03
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 21:09:37 +0000