tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
git-commit.txt - mention that files listed on the command line must be known to git.
[git.git]
/
merge-recursive.c
2008-11-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-16
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
2008-11-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jn/gitweb-customlinks'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'mk/maint-cg-push'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge branch 'st/tag'
blob
|
commitdiff
|
raw
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-11-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-12
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip' into jk/commit...
blob
|
commitdiff
|
raw
2008-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-09
Junio C Hamano
Merge branch 'rs/blame'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'jc/gitweb-fix-cloud-tag'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref'
blob
|
commitdiff
|
raw
2008-11-05
Junio C Hamano
Merge branch 'mv/parseopt-checkout-index'
blob
|
commitdiff
|
raw
2008-11-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'np/index-pack'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'sh/rebase-i-p'
blob
|
commitdiff
|
raw
2008-11-03
Junio C Hamano
Merge branch 'cj/maint-gitpm-fix-maybe-self'
blob
|
commitdiff
|
raw
2008-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-11-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-10-31
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-31
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into ar/mksnpath
blob
|
commitdiff
|
raw
2008-10-27
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into HEAD
blob
|
commitdiff
|
raw
2008-10-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'jk/diff-convfilter'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'js/maint-fetch-update-head'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'jc/maint-co-track'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'rs/alloc-ref'
blob
|
commitdiff
|
raw
2008-10-22
Junio C Hamano
Merge branch 'jk/fix-ls-files-other'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge branch 'jc/maint-reset-remove-unmerged-new'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'sh/maint-rebase3'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'tr/workflow-doc'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'mv/clonev'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'ml/cygwin-filemode'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'gb/refactor-pathinfo'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'dp/checkattr'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'gb/formatpatch-autonbr'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'sp/describe-lwtag'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'ae/preservemerge'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'mv/merge-noff'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'ns/rebase-noverify'
blob
|
commitdiff
|
raw
2008-10-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-19
Matt McCutchen
git-merge-recursive: honor merge.conflictstyle once...
blob
|
commitdiff
|
raw
2008-10-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-18
Junio C Hamano
Merge branch 'pb/commit-where'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Junio C Hamano
Merge branch 'jk/maint-ls-files-other' into jk/fix...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-12
Brandon Casey
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'jc/add-ita'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-09
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-08
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-06
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-03
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-01
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-30
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'bc/master-diff-hunk-header-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-29
Shawn O. Pearce
Merge branch 'jc/better-conflict-resolution'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-26
Alex Riesen
Cleanup remove_path
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge branch 'mv/merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Miklos Vajna
merge-recursive: get rid of virtual_id
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Miklos Vajna
merge-recursive: move current_{file,directory}_set...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Miklos Vajna
merge-recursive: move the global obuf to struct merge_o...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Miklos Vajna
merge-recursive: get rid of the index_only global variable
blob
|
commitdiff
|
raw
|
diff to current
2008-09-04
Miklos Vajna
merge-recursive: move call_depth to struct merge_options
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Miklos Vajna
merge-recursive: introduce merge_options
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Stephan Beyer
merge-recursive.c: Add more generic merge_recursive_gen...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-31
Miklos Vajna
Split out merge_recursive() to merge-recursive.c
blob
|
commitdiff
|
raw
|
diff to current
2008-06-27
Junio C Hamano
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
commitdiff
|
raw
2008-05-26
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-05-23
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
commitdiff
|
raw
2008-05-21
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-05-14
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-05-11
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-05-09
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-05-04
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-30
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-28
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-25
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-23
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-19
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-17
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-16
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
next