tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
diffcore-break: micro-optimize by avoiding delta between identical files.
[git.git]
/
git-merge.sh
2006-02-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2006-02-25
Junio C Hamano
Merge branches 'jc/rev-list' and 'jc/pack-thin'
blob
|
commitdiff
|
raw
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
blob
|
commitdiff
|
raw
2006-02-24
Junio C Hamano
Merge branch 'fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2006-02-24
Junio C Hamano
Merge branch 'ar/win'
blob
|
commitdiff
|
raw
2006-02-24
Junio C Hamano
Merge branch 'jc/send-insane-refs'
blob
|
commitdiff
|
raw
2006-02-24
Junio C Hamano
Merge fixes early for next maint series.
blob
|
commitdiff
|
raw
2006-02-24
Junio C Hamano
Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge branch 'ra/anno'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
checkout - eye candy.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-23
Junio C Hamano
Merge fixes up to GIT 1.2.3
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Keep Porcelainish from failing by broken ident after...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'fix'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/perl'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/pack-reuse'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'jc/nostat'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-22
Junio C Hamano
Merge branch 'js/portable'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge part of jc/portable branch
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge branch 'lt/merge-tree'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-21
Junio C Hamano
Merge branch 'jc/ident'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Johannes Schindelin
Optionally work without python
blob
|
commitdiff
|
raw
|
diff to current
2006-02-19
Junio C Hamano
Keep Porcelainish from failing by broken ident after...
blob
|
commitdiff
|
raw
|
diff to current
2006-02-12
Junio C Hamano
Only call git-rerere if $GIT_DIR/rr-cache exists.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-02-07
Junio C Hamano
git-rerere: reuse recorded resolve.
blob
|
commitdiff
|
raw
|
diff to current
2006-02-04
Junio C Hamano
Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
blob
|
commitdiff
|
raw
|
diff to current
2006-02-04
Junio C Hamano
git-merge: Properly quote $merge_msg variable.
blob
|
commitdiff
|
raw
|
diff to current
2006-01-30
Junio C Hamano
Merge fixes up to GIT 1.1.6
blob
|
commitdiff
|
raw
|
diff to current
2006-01-28
Junio C Hamano
merge: seed the commit message with list of conflicted...
blob
|
commitdiff
|
raw
|
diff to current
2005-12-26
Junio C Hamano
Merge branch 'jc/checkout'
blob
|
commitdiff
|
raw
|
diff to current
2005-12-24
Junio C Hamano
Merge fixes up to GIT 1.0.4
blob
|
commitdiff
|
raw
|
diff to current
2005-12-24
Junio C Hamano
GIT 1.0.4
v1.0.4
blob
|
commitdiff
|
raw
|
diff to current
2005-12-23
Junio C Hamano
merge --no-commit: tweak message
blob
|
commitdiff
|
raw
|
diff to current
2005-12-15
Junio C Hamano
GIT 0.99.9n aka 1.0rc6
v0.99.9n
v1.0rc6
blob
|
commitdiff
|
raw
|
diff to current
2005-12-14
Junio C Hamano
Merge branch 'hold/am'
blob
|
commitdiff
|
raw
|
diff to current
2005-12-14
Junio C Hamano
Merge branch 'fk/usage'
blob
|
commitdiff
|
raw
|
diff to current
2005-12-14
freku045@student...
Trivial usage string clean-up
blob
|
commitdiff
|
raw
|
diff to current
2005-12-14
Junio C Hamano
[PATCH] allow merging any committish
blob
|
commitdiff
|
raw
|
diff to current
2005-12-07
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-12-04
Junio C Hamano
GIT 0.99.9l aka 1.0rc4
v0.99.9l
v1.0rc4
blob
|
commitdiff
|
raw
|
diff to current
2005-12-03
Fredrik Kuivinen
git-merge: Exit with code 2 if no strategy was able...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-29
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-28
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-26
Junio C Hamano
GIT 0.99.9k
v0.99.9k
blob
|
commitdiff
|
raw
|
diff to current
2005-11-25
Junio C Hamano
git-sh-setup: die if outside git repository.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-24
Junio C Hamano
git-merge: make recursive the default strategy
blob
|
commitdiff
|
raw
|
diff to current
2005-11-22
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-20
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-19
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-11-10
Junio C Hamano
GIT 0.99.9g
v0.99.9g
blob
|
commitdiff
|
raw
|
diff to current
2005-11-10
Junio C Hamano
Use 'merge-base --all' where applicable.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-07
Junio C Hamano
GIT 0.99.9e
v0.99.9e
blob
|
commitdiff
|
raw
|
diff to current
2005-11-03
Junio C Hamano
GIT 0.99.9c
v0.99.9c
blob
|
commitdiff
|
raw
|
diff to current
2005-11-03
Junio C Hamano
Add 'ours' merge strategy.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-03
Junio C Hamano
Add --no-commit to git-merge/git-pull.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-31
Junio C Hamano
GIT 0.99.9a
v0.99.9a
blob
|
commitdiff
|
raw
|
diff to current
2005-10-28
Chris Shoemaker
Documentation changes to recursive option for git-diff...
blob
|
commitdiff
|
raw
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-10-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-22
Junio C Hamano
Allow git-merge not to commit.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Fredrik Kuivinen
[PATCH] Enable and fix support for base less merges.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-02
Junio C Hamano
Handle really trivial case inside git-merge.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-29
Peter Anvin
Merge ... www.kernel.org/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-28
Junio C Hamano
Use git-update-ref in scripts.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-28
Junio C Hamano
Fastpath the normal case by not checking that index...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
H. Peter Anvin
Merge ... git+ssh://kernel.org/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Give default merge message after failed automerge.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Fix overzealous cleanliness check in git-merge
blob
|
commitdiff
|
raw
|
diff to current
2005-09-25
Fredrik Kuivinen
[PATCH] More descriptive messages for conflict cases...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-14
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Junio C Hamano
Fix off-by-one error in git-merge
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Add a new merge strategy by Fredrik Kuivinen.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Multi-backend merge driver.
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
