summaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
* git-merge knows some strategies want to skip trivial mergesJunio C Hamano2006-03-201-27/+40
* allow double click on current HEAD id after git-pullOlaf Hering2006-03-091-1/+1
* Merge fixes early for next maint series.Junio C Hamano2006-02-231-2/+2
|\
| * checkout - eye candy.Junio C Hamano2006-02-221-2/+2
| * Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-221-0/+5
* | Merge part of jc/portable branchJunio C Hamano2006-02-211-0/+4
|\ \
| * | Optionally work without pythonJohannes Schindelin2006-02-181-0/+4
| |/
* | Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano2006-02-181-0/+5
|/
* 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
* git-merge: Properly quote $merge_msg variable.Junio C Hamano2006-02-031-1/+1
* merge: seed the commit message with list of conflicted files.Junio C Hamano2006-01-271-0/+8
* merge --no-commit: tweak messageJunio C Hamano2005-12-231-1/+10
* Trivial usage string clean-upfreku045@student.liu.se2005-12-141-4/+2
* [PATCH] allow merging any committishJunio C Hamano2005-12-131-1/+4
* git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen2005-12-031-1/+2
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-251-1/+1
* git-merge: make recursive the default strategyJunio C Hamano2005-11-231-8/+12
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-091-2/+9
* Add 'ours' merge strategy.Junio C Hamano2005-11-031-1/+1
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-031-10/+18
* Documentation changes to recursive option for git-diff-treeChris Shoemaker2005-10-281-1/+1
* Allow git-merge not to commit.Junio C Hamano2005-10-221-11/+17
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-031-2/+2
* Handle really trivial case inside git-merge.Junio C Hamano2005-10-021-1/+21
* Use git-update-ref in scripts.Junio C Hamano2005-09-281-4/+5
* Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano2005-09-281-7/+4
View Lorry Controller Status