tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
grep: Colorize filename, line number, and separator
[git.git]
/
merge-recursive.c
2010-02-26
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
2010-02-24
Junio C Hamano
Merge branch 'ml/maint-grep-doc' into maint
blob
|
commitdiff
|
raw
2010-02-21
Junio C Hamano
Merge branch 'ml/maint-grep-doc'
blob
|
commitdiff
|
raw
2010-02-21
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf'
blob
|
commitdiff
|
raw
2010-02-21
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm'
blob
|
commitdiff
|
raw
2010-02-19
Junio C Hamano
Merge branch 'jk/maint-rmdir-fix' into maint
blob
|
commitdiff
|
raw
2010-02-16
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
2010-02-16
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-02-15
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Sync with 1.6.6.2
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'gp/maint-cvsserver' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'il/maint-xmallocz' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'nd/include-termios-for-osol' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'rs/maint-archive-match-pathspec' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-02-10
Junio C Hamano
Merge branch 'sp/maint-push-sideband' into sp/push...
blob
|
commitdiff
|
raw
2010-02-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-09
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-09
Junio C Hamano
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-07
Junio C Hamano
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
commitdiff
|
raw
2010-02-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge branch 'sp/maint-push-sideband' into sp/push...
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-02-05
Junio C Hamano
Merge branch 'jc/maint-limit-note-output' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-01
Junio C Hamano
Merge branch 'sp/maint-fast-import-large-blob' into...
blob
|
commitdiff
|
raw
2010-02-01
Junio C Hamano
Merge branch 'bg/maint-add-all-doc' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-01-31
Junio C Hamano
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
commitdiff
|
raw
|
diff to current
2010-01-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-30
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-29
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'gp/maint-cvsserver'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-colon-address'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-xmallocz'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix'
blob
|
commitdiff
|
raw
2010-01-25
Junio C Hamano
Merge branch 'jc/fix-tree-walk'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-24
Junio C Hamano
Merge branch 'doc-style/for-next' of git://repo.or...
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/branch-d'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/rev-glob'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'js/refer-upstream'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jl/submodule-diff'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/remote-updates'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'il/branch-set-upstream'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'jc/maint-limit-note-output'
blob
|
commitdiff
|
raw
2010-01-23
Junio C Hamano
Merge branch 'nd/ls-files-sparse-fix'
blob
|
commitdiff
|
raw
2010-01-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-22
Junio C Hamano
merge-recursive: do not return NULL only to cause segfault
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'bw/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'ag/patch-header-verify'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'ag/maint-apply-too-large-p'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-21
Junio C Hamano
Merge branch 'ap/merge-backend-opts'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'bg/maint-remote-update-default' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'sb/maint-octopus' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'bg/maint-add-all-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-20
Junio C Hamano
Merge branch 'jk/maint-1.6.5-reset-hard' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.3' into maint-1.6.4
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-19
Junio C Hamano
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-18
Junio C Hamano
Make "subtree" part more orthogonal to the rest of...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-18
Avery Pennarun
git merge -X<option>
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-13
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-13
Junio C Hamano
Merge branch 'nd/sparse'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-12
Junio C Hamano
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'tr/http-updates'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'jk/maint-1.6.5-reset-hard'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'bg/maint-remote-update-default'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2010-01-07
Junio C Hamano
Merge branch 'js/filter-branch-prime'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-07
Junio C Hamano
Merge branch 'sb/maint-octopus'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-07
Junio C Hamano
Merge branch 'bg/maint-add-all-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-07
Junio C Hamano
Merge branch 'mo/bin-wrappers'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-31
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-12-28
Junio C Hamano
Merge branch 'jk/1.7.0-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-27
Junio C Hamano
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
Merge branch 'gb/1.7.0-diff-whitespace-only-output'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-12-26
Junio C Hamano
Merge branch 'jc/1.7.0-push-safety'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
