tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
lf_to_crlf_filter(): tell the caller we added "\n" when draining
[git.git]
/
merge-recursive.h
2011-09-26
Junio C Hamano
Merge branch 'jc/namespace-doc-with-old-asciidoc'
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
Merge 1.7.6.4 in
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
Merge branch 'mh/check-ref-format-print-normalize'...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-09-19
Junio C Hamano
Merge branch 'ph/format-patch-no-color'
blob
|
commitdiff
|
raw
2011-09-17
Junio C Hamano
Merge branch 'ci/forbid-unwanted-current-branch-update'
blob
|
commitdiff
|
raw
2011-09-15
Junio C Hamano
Merge branch 'ph/format-patch-no-color'
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Sync with 1.7.6.3
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Merge branch 'jn/remote-helpers-doc'
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-09-12
Junio C Hamano
Merge branch 'jk/tag-contains-ab' (early part) into...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Merge branch 'jk/maint-1.7.2-status-ignored' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Junio C Hamano
Merge branch 'rc/histogram-diff'
blob
|
commitdiff
|
raw
2011-09-06
Junio C Hamano
Merge branch 'cb/maint-ls-files-error-report'
blob
|
commitdiff
|
raw
2011-09-06
Junio C Hamano
Merge branch 'mh/check-ref-format-print-normalize'
blob
|
commitdiff
|
raw
2011-09-06
Junio C Hamano
Sync with 1.7.6.2
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'js/i18n-scripts-2'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-t3903-misquoted-command'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'bc/bisect-test-use-shell-path'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'va/p4-branch-import-test-update'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-strbuf-grow-nul-termination'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-ident-to-git-memmove'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-format-patch-empty-output'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'ms/daemon-timeout-is-in-seconds'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'bg/t5540-osx-grep'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'jc/clean-exclude-doc'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'mg/maint-notes-C-doc'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'fg/submodule-ff-check-before-push'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'rc/diff-cleanup-records'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'fk/use-kwset-pickaxe-grep-f'
blob
|
commitdiff
|
raw
2011-09-02
Junio C Hamano
Merge branch 'en/merge-recursive-2'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'jn/plug-empty-tree-leak'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jk/fast-export-quote-path' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jn/mime-type-with-params' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Save D/F conflict filenames instead...
blob
|
commitdiff
|
raw
2011-08-11
Junio C Hamano
Merge branch 'jk/fast-export-quote-path'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jk/clone-detached'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jc/legacy-loose-object' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-01
Junio C Hamano
Merge branch 'jc/maint-1.7.3-checkout-describe' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'jk/tag-contains-ab'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-22
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jc/index-pack'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jn/mime-type-with-params'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-19
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-13
Junio C Hamano
Merge branch 'js/rebase-typo-branch-squelch-usage'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-13
Junio C Hamano
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-13
Junio C Hamano
Merge branch 'jc/legacy-loose-object'
blob
|
commitdiff
|
raw
|
diff to current
2011-07-06
Junio C Hamano
Merge commit 'v1.7.6' into jc/checkout-reflog-fix
blob
|
commitdiff
|
raw
|
diff to current
2011-07-06
Junio C Hamano
Merge commit 'v1.7.0' into jc/checkout-reflog-fix
blob
|
commitdiff
|
raw
|
diff to current
2011-06-30
Junio C Hamano
Merge branch 'ef/maint-win-verify-path'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-30
Junio C Hamano
Merge branch 'jc/maint-1.7.3-checkout-describe'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-30
Junio C Hamano
Merge branch 'jk/maint-1.7.2-status-ignored'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-30
Junio C Hamano
Merge branch 'jc/advice-about-to-lose-commit'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-29
Junio C Hamano
Merge branch 'jn/maint-doc-dashdash' into jn/doc-dashdash
blob
|
commitdiff
|
raw
|
diff to current
2011-06-24
Junio C Hamano
Merge branch 'maint-1.7.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-06-06
Junio C Hamano
Merge branch 'jn/mime-type-with-params'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-06
Junio C Hamano
Merge branch 'jk/diff-not-so-quick'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-06
Junio C Hamano
Merge branch 'bc/maint-status-z-to-use-porcelain'
blob
|
commitdiff
|
raw
|
diff to current
2011-06-01
Junio C Hamano
Merge branch 'jk/maint-config-alias-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-06-01
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge branch 'jk/format-patch-am'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge branch 'jc/log-quiet-fix'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge branch 'jk/maint-remote-mirror-safer'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge branch 'rr/doc-content-type' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge remote-tracking branch 'ko/maint' into jc/diff...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-31
Junio C Hamano
Merge branch 'jk/maint-config-alias-fix'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-30
Junio C Hamano
Merge branch 'jm/maint-misc-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'rg/no-gecos-in-pwent'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'jc/require-work-tree-exists'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'maint-1.7.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'jm/maint-diff-words-with-sbe' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'ss/doc-svn' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'rg/copy-gecos-username' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-26
Junio C Hamano
Merge branch 'svn-fe-maint' of git://repo.or.cz/git...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-23
Junio C Hamano
Merge branch 'jm/maint-diff-words-with-sbe'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-23
Junio C Hamano
Merge branch 'js/mingw-shutdown'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-20
Junio C Hamano
Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-20
Junio C Hamano
Merge branch 'rg/copy-gecos-username'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-20
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-20
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-17
Junio C Hamano
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jn/maint-format-patch-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'ss/cherry-pick-x-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
