tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
tests: add a testcase for "git submodule sync"
[git.git]
/
merge-recursive.c
2008-10-03
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-10-01
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-09-30
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-09-29
Shawn O. Pearce
Merge branch 'bc/master-diff-hunk-header-fix'
blob
|
commitdiff
|
raw
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
2008-04-12
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-10
Junio C Hamano
Merge branch 'maint-1.5.4' into maint
blob
|
commitdiff
|
raw
2008-04-09
Junio C Hamano
Merge branch 'jc/rename'
blob
|
commitdiff
|
raw
2008-04-07
Junio C Hamano
Merge branch 'jc/maint-apply-match-beginning'
blob
|
commitdiff
|
raw
2008-03-28
Junio C Hamano
GIT 1.5.5-rc2
v1.5.5-rc2
blob
|
commitdiff
|
raw
2008-03-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-26
Junio C Hamano
Merge branch 'jc/maint-fetch-regression-1.5.4'
blob
|
commitdiff
|
raw
2008-03-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-14
Junio C Hamano
Merge branch 'ph/maint-quiltimport' into maint
blob
|
commitdiff
|
raw
|
diff to current
2008-03-14
Clemens Buchacher
merge-recursive: handle file mode changes
blob
|
commitdiff
|
raw
|
diff to current
2008-03-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-11
Junio C Hamano
Merge branch 'jc/cherry-pick' (early part)
blob
|
commitdiff
|
raw
2008-03-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-09
Junio C Hamano
Merge branch 'kb/maint-filter-branch-disappear'
blob
|
commitdiff
|
raw
2008-03-09
Junio C Hamano
Merge branch 'maint' to sync with 1.5.4.4
blob
|
commitdiff
|
raw
2008-03-08
Junio C Hamano
Merge branch 'aw/maint-shortlog-blank-lines'
blob
|
commitdiff
|
raw
2008-03-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-03
Junio C Hamano
Merge commit '74359821' into js/reflog-delete
blob
|
commitdiff
|
raw
2008-03-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'pb/cvsimport'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'jc/maint-log-merge-left-right'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'mh/maint-http-proxy-fix'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'cb/http-test'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'jc/remote-multi-url'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'jn/gitweb-grep'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'mk/maint-parse-careful'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'sb/describe-long'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'ew/maint-svn-cert-fileprovider'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'js/maint-daemon'
blob
|
commitdiff
|
raw
2008-03-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-01
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'jm/free'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'db/checkout'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'db/cover-letter'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'js/merge'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'jc/diff-relative'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-27
Junio C Hamano
Merge branch 'db/host-alias'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-25
Junio C Hamano
Merge branch 'lt/dirstat'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-25
Junio C Hamano
Merge branch 'jc/apply-whitespace'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Sync with 1.5.4.3
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'bc/reflog-fix' into js/reflog-delete
blob
|
commitdiff
|
raw
|
diff to current
2008-02-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'mk/color'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'js/maint-cvsexport'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'js/maint-http-push'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'jk/empty-tree'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'lt/revision-walker'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'mc/prefix'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'bc/fopen'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'jc/setup'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-19
Junio C Hamano
Merge branch 'mk/maint-parse-careful'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-18
Junio C Hamano
merge-recursive: split low-level merge functions out.
blob
|
commitdiff
|
raw
|
diff to current
2008-02-18
Martin Koegler
deref_tag: handle return value NULL
blob
|
commitdiff
|
raw
|
diff to current
2008-02-18
Junio C Hamano
Merge branch 'br/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
