tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
gitweb.cgi: git_blame2: Revision blocks now have alternating colors
[git.git]
/
git-merge-recursive.py
2006-07-13
Junio C Hamano
Merge branch 'ml/trace'
blob
|
commitdiff
|
raw
2006-07-13
Junio C Hamano
Merge branch 'js/merge-base'
blob
|
commitdiff
|
raw
2006-07-13
Junio C Hamano
Merge branch 'lt/prune'
blob
|
commitdiff
|
raw
2006-07-13
Junio C Hamano
Merge branch 'lt/merge-tree'
blob
|
commitdiff
|
raw
2006-07-10
Junio C Hamano
Merge branch 'jc/show-merge'
blob
|
commitdiff
|
raw
2006-07-10
Pavel Roskin
Fix more typos, primarily in the code
blob
|
commitdiff
|
raw
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
|
diff to current
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-04
Junio C Hamano
Merge branch 'new' of git://git./gitk/gitk into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-05-03
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-24
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-04-05
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-31
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-03-26
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 git://git.kernel.org/pub/scm/gitk/gitk
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-02
Fredrik Kuivinen
merge-recursive: Make use of provided bases
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-30
Junio C Hamano
GIT 1.1.6
v1.1.6
blob
|
commitdiff
|
raw
|
diff to current
2006-01-29
Fredrik Kuivinen
merge-recursive: Improve the error message printed...
blob
|
commitdiff
|
raw
|
diff to current
2006-01-27
Junio C Hamano
GIT 1.1.5
v1.1.5
blob
|
commitdiff
|
raw
|
diff to current
2006-01-20
Junio C Hamano
GIT 1.1.4
v1.1.4
blob
|
commitdiff
|
raw
|
diff to current
2006-01-16
Junio C Hamano
GIT 1.1.3
v1.1.3
blob
|
commitdiff
|
raw
|
diff to current
2006-01-16
Junio C Hamano
Merge branch 'fixo/1.0'
blob
|
commitdiff
|
raw
|
diff to current
2006-01-14
Junio C Hamano
GIT 1.1.2
v1.1.2
blob
|
commitdiff
|
raw
|
diff to current
2006-01-11
Junio C Hamano
GIT 1.1.1
v1.1.1
blob
|
commitdiff
|
raw
|
diff to current
2006-01-08
Junio C Hamano
GIT 1.1.0
v1.1.0
blob
|
commitdiff
|
raw
|
diff to current
2006-01-06
Junio C Hamano
Merge fixes up to GIT 1.0.7
blob
|
commitdiff
|
raw
|
diff to current
2005-12-28
Junio C Hamano
Merge fixes up to GIT 1.0.6
blob
|
commitdiff
|
raw
|
diff to current
2005-12-27
Junio C Hamano
Merge fixes up to GIT 1.0.5
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-23
Junio C Hamano
Merge in fixes up to 1.0.3 maintenance branch.
blob
|
commitdiff
|
raw
|
diff to current
2005-12-22
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-12-22
Junio C Hamano
merge-recursive: conflicting rename case.
blob
|
commitdiff
|
raw
|
diff to current
2005-12-12
Junio C Hamano
GIT 0.99.9m aka 1.0rc5
v0.99.9m
v1.0rc5
blob
|
commitdiff
|
raw
|
diff to current
2005-12-11
Junio C Hamano
merge-recursive: cleanup setIndexStages
blob
|
commitdiff
|
raw
|
diff to current
2005-12-11
Junio C Hamano
merge-recursive: leave unmerged entries in the index.
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-02
Junio C Hamano
merge-recursive: adjust git-ls-tree use for the latest.
blob
|
commitdiff
|
raw
|
diff to current
2005-11-30
Junio C Hamano
Merge branch 'jc/subdir'
blob
|
commitdiff
|
raw
|
diff to current
2005-11-30
Junio C Hamano
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-30
Junio C Hamano
merge-recursive: match the unmerged index entry behavio...
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-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-20
Fredrik Kuivinen
merge-recursive: Replace 'except:'
blob
|
commitdiff
|
raw
|
diff to current
2005-11-20
Junio C Hamano
merge-recursive::removeFile: remove empty directories
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-17
Junio C Hamano
GIT 0.99.9j aka 1.0rc3
v0.99.9j
v1.0rc3
blob
|
commitdiff
|
raw
|
diff to current
2005-11-16
Johannes Schindelin
Give python a chance to find "backported" modules
blob
|
commitdiff
|
raw
|
diff to current
2005-11-12
Junio C Hamano
GIT 0.99.9h
v0.99.9h
v1.0rc1
blob
|
commitdiff
|
raw
|
diff to current
2005-11-12
Fredrik Kuivinen
merge-recursive: Use '~' instead of '_' to separate...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-12
Fredrik Kuivinen
merge-recursive: Add copyright notice
blob
|
commitdiff
|
raw
|
diff to current
2005-11-12
Fredrik Kuivinen
merge-recursive: Indent the output properly
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
Merge branch 'hold/svn'
blob
|
commitdiff
|
raw
|
diff to current
2005-11-10
Junio C Hamano
Merge branch 'hold/rpm'
blob
|
commitdiff
|
raw
|
diff to current
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix support for branch names containin...
blob
|
commitdiff
|
raw
|
diff to current
2005-11-09
Fredrik Kuivinen
merge-recursive: Fix limited output of rename messages
blob
|
commitdiff
|
raw
|
diff to current
2005-11-08
Junio C Hamano
Merge branch 'master'
blob
|
commitdiff
|
raw
|
diff to current
2005-11-08
Fredrik Kuivinen
merge-recursive: Only print relevant rename messages
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-10-31
Junio C Hamano
GIT 0.99.9a
v0.99.9a
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-21
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-18
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-16
Junio C Hamano
Merge branch 'svn' of netz.smurf.noris.de/git/git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-15
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-12
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-10
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-10
Junio C Hamano
Deal with $(bindir) and friends with whitespaces.
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-02
Fredrik Kuivinen
[PATCH] Teach the recursive merge strategy about renames.
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-25
Fredrik Kuivinen
[PATCH] recursive-merge: Don't print a stack trace...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-14
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
raw
|
diff to current
2005-09-14
Junio C Hamano
git-merge-recursive: Trivial RE fixes.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Use a temporary index file when we merge the...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Adjust git-merge-recursive.py for the new tool...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Don't output 'Automatic merge failed, ...'
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Be more like the 'resolve' strategy.
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
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
