Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Merge http://www.kernel.org/pub/scm/gitk/gitk
[gitweb.git]
/
git-merge-recursive.py
2005-11-20
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2005-11-20
merge-recursive: Replace 'except:'
blob
|
diff
|
raw
2005-11-20
merge-recursive::removeFile: remove empty directories
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-16
Give python a chance to find "backported" modules
blob
|
diff
|
raw
|
diff to current
2005-11-12
merge-recursive: Use '~' instead of '_' to separate...
blob
|
diff
|
raw
|
diff to current
2005-11-12
merge-recursive: Add copyright notice
blob
|
diff
|
raw
|
diff to current
2005-11-12
merge-recursive: Indent the output properly
blob
|
diff
|
raw
|
diff to current
2005-11-10
Merge branch 'hold/svn'
blob
|
diff
|
raw
|
diff to current
2005-11-10
Merge branch 'hold/rpm'
blob
|
diff
|
raw
|
diff to current
2005-11-09
merge-recursive: Fix support for branch names containin...
blob
|
diff
|
raw
|
diff to current
2005-11-09
merge-recursive: Fix limited output of rename messages
blob
|
diff
|
raw
|
diff to current
2005-11-08
merge-recursive: Only print relevant rename messages
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-21
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-18
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-16
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-16
Merge branch 'svn' of netz.smurf.noris.de/git/git
blob
|
diff
|
raw
|
diff to current
2005-10-15
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-12
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-10
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-10
Deal with $(bindir) and friends with whitespaces.
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-02
[PATCH] Teach the recursive merge strategy about renames.
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-25
[PATCH] recursive-merge: Don't print a stack trace...
blob
|
diff
|
raw
|
diff to current
2005-09-14
Merge branch 'master' of .
blob
|
diff
|
raw
|
diff to current
2005-09-14
git-merge-recursive: Trivial RE fixes.
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Use a temporary index file when we merge the...
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Adjust git-merge-recursive.py for the new tool...
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Don't output 'Automatic merge failed, ...'
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Be more like the 'resolve' strategy.
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
diff
|
raw
|
diff to current