tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
grep: NUL terminate input from a file
[git.git]
/
builtin-merge.c
2009-12-09
Junio C Hamano
Merge branch 'mm/maint-merge-ff-error-message-fix'...
blob
|
commitdiff
|
raw
2009-12-09
Junio C Hamano
Merge branch 'jn/maint-pull-rebase-error-message' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge branch 'jk/maint-add-p-delete-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'ap/maint-merge-strategy-list-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rs/work-around-grep-opt-insanity' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-cygwin-count-objects' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'mm/maint-hint-failed-merge' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'th/maint-remote-update-help-string' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-t9700' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'mo/maint-crlf-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'th/remote-usage' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'pb/maint-use-custom-perl' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'mm/config-pathname-tilde-expand' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'bc/grep-i-F' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory'...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-simplify-cygwin-makefile' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'rg/doc-workflow' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-02
Junio C Hamano
merge: do not add standard message when message is...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-02
Junio C Hamano
Do not misidentify "git merge foo HEAD" as an old-style...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Matthieu Moy
builtin-merge: show user-friendly error messages for...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-30
Avery Pennarun
builtin-merge.c: call exclude_cmds() correctly.
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'bs/maint-pre-commit-hook-sample' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-add-p-empty' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'js/maint-diff-color-words' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'tz/maint-rpm' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-format-patch-p-suppress-stat...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'pb/maint-gitweb-blob-lineno' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'vl/maint-openssl-signature-change' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-push-config' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'sr/blame-incomplete' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'tr/maint-roff-quote' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'ja/fetch-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'cb/doc-fetch-pull-merge' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-cvsimport-pathname' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jc/receive-pack-auto' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'gb/maint-gitweb-esc-param' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jn/gitweb-patch' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Jonathan Nieder
merge: do not setup worktree twice
blob
|
commitdiff
|
raw
|
diff to current
2009-10-28
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jp/maint-send-email-fold' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'pv/maint-add-p-no-exclude' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-17
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-13
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-09
Junio C Hamano
Merge branch 'rs/maint-archive-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'jc/maint-1.6.4-show-branch-default' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge 1.6.4.4 in
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'jc/maint-unpack-objects-strict' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'jc/maint-checkout-index-to-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-13
Junio C Hamano
Merge branch 'db/vcs-helper'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-13
Junio C Hamano
Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Junio C Hamano
Merge branch 'tr/reset-checkout-patch'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Junio C Hamano
Merge branch 'np/maint-1.6.3-deepen'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-09-01
Junio C Hamano
Merge branch 'mr/gitweb-snapshot'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-01
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Sync with 1.6.4.2
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'jk/maint-1.6.3-checkout-unborn'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'np/maint-1.6.3-deepen'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'jc/shortstatus'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'rc/maint-http-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'lt/block-sha1'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
