Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
rev-list.c: fix non-grammatical comments.
[gitweb.git]
/
git-merge.sh
2006-02-22
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2006-02-22
Merge branch 'fix'
blob
|
diff
|
raw
2006-02-22
Merge branch 'jc/perl'
blob
|
diff
|
raw
2006-02-22
Merge branch 'jc/pack-reuse'
blob
|
diff
|
raw
2006-02-22
Merge branch 'jc/nostat'
blob
|
diff
|
raw
2006-02-22
Merge branch 'js/portable'
blob
|
diff
|
raw
2006-02-21
Merge part of jc/portable branch
blob
|
diff
|
raw
2006-02-21
Merge branch 'lt/merge-tree'
blob
|
diff
|
raw
|
diff to current
2006-02-21
Merge branch 'jc/ident'
blob
|
diff
|
raw
|
diff to current
2006-02-19
Optionally work without python
blob
|
diff
|
raw
|
diff to current
2006-02-19
Keep Porcelainish from failing by broken ident after...
blob
|
diff
|
raw
|
diff to current
2006-02-12
Only call git-rerere if $GIT_DIR/rr-cache exists.
blob
|
diff
|
raw
|
diff to current
2006-02-07
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-02-07
git-rerere: reuse recorded resolve.
blob
|
diff
|
raw
|
diff to current
2006-02-04
Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
blob
|
diff
|
raw
|
diff to current
2006-02-04
git-merge: Properly quote $merge_msg variable.
blob
|
diff
|
raw
|
diff to current
2006-01-30
Merge fixes up to GIT 1.1.6
blob
|
diff
|
raw
|
diff to current
2006-01-28
merge: seed the commit message with list of conflicted...
blob
|
diff
|
raw
|
diff to current
2005-12-26
Merge branch 'jc/checkout'
blob
|
diff
|
raw
|
diff to current
2005-12-24
Merge fixes up to GIT 1.0.4
blob
|
diff
|
raw
|
diff to current
2005-12-24
GIT 1.0.4
v1.0.4
blob
|
diff
|
raw
|
diff to current
2005-12-23
merge --no-commit: tweak message
blob
|
diff
|
raw
|
diff to current
2005-12-15
GIT 0.99.9n aka 1.0rc6
v0.99.9n
v1.0rc6
blob
|
diff
|
raw
|
diff to current
2005-12-14
Merge branch 'hold/am'
blob
|
diff
|
raw
|
diff to current
2005-12-14
Merge branch 'fk/usage'
blob
|
diff
|
raw
|
diff to current
2005-12-14
Trivial usage string clean-up
blob
|
diff
|
raw
|
diff to current
2005-12-14
[PATCH] allow merging any committish
blob
|
diff
|
raw
|
diff to current
2005-12-07
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-12-04
GIT 0.99.9l aka 1.0rc4
v0.99.9l
v1.0rc4
blob
|
diff
|
raw
|
diff to current
2005-12-03
git-merge: Exit with code 2 if no strategy was able...
blob
|
diff
|
raw
|
diff to current
2005-11-29
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-11-28
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-11-27
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-11-26
GIT 0.99.9k
v0.99.9k
blob
|
diff
|
raw
|
diff to current
2005-11-25
git-sh-setup: die if outside git repository.
blob
|
diff
|
raw
|
diff to current
2005-11-24
git-merge: make recursive the default strategy
blob
|
diff
|
raw
|
diff to current
2005-11-22
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-11-20
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-11-19
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-11-10
GIT 0.99.9g
v0.99.9g
blob
|
diff
|
raw
|
diff to current
2005-11-10
Use 'merge-base --all' where applicable.
blob
|
diff
|
raw
|
diff to current
2005-11-07
GIT 0.99.9e
v0.99.9e
blob
|
diff
|
raw
|
diff to current
2005-11-03
GIT 0.99.9c
v0.99.9c
blob
|
diff
|
raw
|
diff to current
2005-11-03
Add 'ours' merge strategy.
blob
|
diff
|
raw
|
diff to current
2005-11-03
Add --no-commit to git-merge/git-pull.
blob
|
diff
|
raw
|
diff to current
2005-10-31
GIT 0.99.9a
v0.99.9a
blob
|
diff
|
raw
|
diff to current
2005-10-28
Documentation changes to recursive option for git-diff...
blob
|
diff
|
raw
|
diff to current
2005-10-27
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-10-23
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-22
Allow git-merge not to commit.
blob
|
diff
|
raw
|
diff to current
2005-10-03
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-10-03
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-03
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-10-03
[PATCH] Enable and fix support for base less merges.
blob
|
diff
|
raw
|
diff to current
2005-10-02
Handle really trivial case inside git-merge.
blob
|
diff
|
raw
|
diff to current
2005-09-29
Merge ... www.kernel.org/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-09-28
Use git-update-ref in scripts.
blob
|
diff
|
raw
|
diff to current
2005-09-28
Fastpath the normal case by not checking that index...
blob
|
diff
|
raw
|
diff to current
2005-09-27
Merge ... git+ssh://kernel.org/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-09-27
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-09-27
Give default merge message after failed automerge.
blob
|
diff
|
raw
|
diff to current
2005-09-27
Fix overzealous cleanliness check in git-merge
blob
|
diff
|
raw
|
diff to current
2005-09-25
[PATCH] More descriptive messages for conflict cases...
blob
|
diff
|
raw
|
diff to current
2005-09-14
Merge branch 'master' of .
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
diff
|
raw
|
diff to current
2005-09-13
Fix off-by-one error in git-merge
blob
|
diff
|
raw
|
diff to current
2005-09-11
Add a new merge strategy by Fredrik Kuivinen.
blob
|
diff
|
raw
|
diff to current
2005-09-11
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
diff
|
raw
|
diff to current
2005-09-11
Multi-backend merge driver.
blob
|
diff
|
raw
|
diff to current