index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-merge.sh
Age
Commit message (
Expand
)
Author
2006-12-13
git merge: reword failure message.
Junio C Hamano
2006-12-06
git-merge: fix "fix confusion between tag and branch" for real
Junio C Hamano
2006-12-06
git-merge: squelch needless error message.
Junio C Hamano
2006-12-06
Loosen "working file will be lost" check in Porcelain-ish
Junio C Hamano
2006-12-03
git-merge: fix confusion between tag and branch
Junio C Hamano
2006-11-27
git-merge: do not leak rev-parse output used for checking internally.
Junio C Hamano
2006-11-27
git-merge: tighten error checking.
Junio C Hamano
2006-11-22
merge: allow merging into a yet-to-be-born branch.
Junio C Hamano
2006-11-22
git-merge: make it usable as the first class UI
Junio C Hamano
2006-11-22
remove merge-recursive-old
Junio C Hamano
2006-10-23
Merge branch 'maint'
Junio C Hamano
2006-10-22
git-merge: show usage if run without arguments
Rene Scharfe
2006-10-01
merge and resolve: Output short hashes and .. in "Updating ..."
Santi BĂ©jar
2006-09-25
Deprecate merge-recursive.py
Junio C Hamano
2006-07-31
Merge branch 'js/read-tree' into js/c-merge-recursive
Junio C Hamano
2006-07-14
recur vs recursive: help testing without touching too many stuff.
Junio C Hamano
2006-07-14
Status update on merge-recursive in C
Johannes Schindelin
2006-07-11
Log ref changes made by git-merge and git-pull.
Shawn Pearce
2006-06-27
Fix expr usage for FreeBSD
Dennis Stosberg
2006-06-24
git-merge --squash
Junio C Hamano
2006-06-24
git-merge: Don't use -p when outputting summary
Timo Hirvonen
2006-05-14
Convert some "apply --summary" users to "diff --summary".
Sean
2006-04-19
git-merge: a bit more readable user guidance.
Junio C Hamano
2006-03-20
git-merge knows some strategies want to skip trivial merges
Junio C Hamano
2006-03-10
allow double click on current HEAD id after git-pull
Olaf Hering
2006-02-24
Merge fixes early for next maint series.
Junio C Hamano
2006-02-23
checkout - eye candy.
Junio C Hamano
2006-02-22
Keep Porcelainish from failing by broken ident after making changes.
Junio C Hamano
2006-02-21
Merge part of jc/portable branch
Junio C Hamano
2006-02-19
Optionally work without python
Johannes Schindelin
2006-02-19
Keep Porcelainish from failing by broken ident after making changes.
Junio C Hamano
2006-02-12
Only call git-rerere if $GIT_DIR/rr-cache exists.
Junio C Hamano
2006-02-07
git-rerere: reuse recorded resolve.
Junio C Hamano
2006-02-04
git-merge: Properly quote $merge_msg variable.
Junio C Hamano
2006-01-28
merge: seed the commit message with list of conflicted files.
Junio C Hamano
2005-12-23
merge --no-commit: tweak message
Junio C Hamano
2005-12-14
Trivial usage string clean-up
freku045@student.liu.se
2005-12-14
[PATCH] allow merging any committish
Junio C Hamano
2005-12-03
git-merge: Exit with code 2 if no strategy was able to handle the merge.
Fredrik Kuivinen
2005-11-25
git-sh-setup: die if outside git repository.
Junio C Hamano
2005-11-24
git-merge: make recursive the default strategy
Junio C Hamano
2005-11-10
Use 'merge-base --all' where applicable.
Junio C Hamano
2005-11-03
Add 'ours' merge strategy.
Junio C Hamano
2005-11-03
Add --no-commit to git-merge/git-pull.
Junio C Hamano
2005-10-28
Documentation changes to recursive option for git-diff-tree
Chris Shoemaker
2005-10-22
Allow git-merge not to commit.
Junio C Hamano
2005-10-03
[PATCH] Enable and fix support for base less merges.
Fredrik Kuivinen
2005-10-02
Handle really trivial case inside git-merge.
Junio C Hamano
2005-09-28
Use git-update-ref in scripts.
Junio C Hamano
2005-09-28
Fastpath the normal case by not checking that index matches HEAD.
Junio C Hamano
[prev]
[next]