Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
Use merge-recursive in git-checkout -m (branch switching)
[gitweb.git]
/
t
/
t3402-rebase-merge.sh
2007-01-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2006-11-29
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
diff
|
raw
2006-11-24
Merge branch 'jc/upload-pack'
blob
|
diff
|
raw
2006-11-13
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-12
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-11
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-09
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-09
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2006-11-08
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-08
Merge branch 'jc/pickaxe'
blob
|
diff
|
raw
2006-11-07
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-05
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-05
Merge branch 'pb/web'
blob
|
diff
|
raw
2006-11-04
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-03
Merge branch 'sp/keep-pack' into np/index-pack
blob
|
diff
|
raw
2006-11-03
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-01
Merge branch 'maint'
blob
|
diff
|
raw
2006-11-01
Merge branch 'rs/cherry'
blob
|
diff
|
raw
2006-11-01
Merge branch 'jc/refs-and-fetch'
blob
|
diff
|
raw
2006-11-01
Merge branch 'lj/refs'
blob
|
diff
|
raw
2006-10-31
Merge branch 'maint'
blob
|
diff
|
raw
2006-10-29
Merge early part of branch 'np/index-pack' into sp...
blob
|
diff
|
raw
2006-10-27
tests: merge-recursive is usable without Python
blob
|
diff
|
raw
2006-09-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-08-13
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2006-07-14
recur vs recursive: help testing without touching too...
blob
|
diff
|
raw
|
diff to current
2006-07-14
Status update on merge-recursive in C
blob
|
diff
|
raw
|
diff to current
2006-06-22
Merge branch 'js/lsfix'
blob
|
diff
|
raw
|
diff to current
2006-06-22
Merge branch 'ew/rebase'
blob
|
diff
|
raw
|
diff to current
2006-06-22
Merge branch 'jn/web' into next
blob
|
diff
|
raw
|
diff to current
2006-06-22
Merge branch 'master' into next
blob
|
diff
|
raw
|
diff to current
2006-06-21
Merge branch 'jc/upload-corrupt' into next
blob
|
diff
|
raw
|
diff to current
2006-06-21
Merge branch 'jn/web' into next
blob
|
diff
|
raw
|
diff to current
2006-06-21
Merge branch 'ew/rebase' into next
blob
|
diff
|
raw
|
diff to current
2006-06-21
rebase: error out for NO_PYTHON if they use recursive...
blob
|
diff
|
raw
|
diff to current
2006-06-21
Add renaming-rebase test.
blob
|
diff
|
raw