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]
/
ll-merge.c
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 '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 '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 '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 'en/merge-recursive-2'
blob
|
commitdiff
|
raw
2011-08-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'nd/decorate-grafts'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'nd/maint-clone-gitdir'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'ci/forbid-unwanted-current-branch-update'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'jk/pager-with-external-command'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'jc/maint-clone-alternates'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'jk/color-and-pager'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'mh/attr'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-tagging'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-blob-tweak'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-deltified-tree'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-ident'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'bw/doc-repo-layout'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'va/p4-branch-import'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'jc/combine-diff-callback'
blob
|
commitdiff
|
raw
2011-08-29
Junio C Hamano
Merge branch 'nk/branch-v-abbrev'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'jc/merge-reword'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'mg/branch-set-upstream-previous'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'jc/maint-autofix-tag-in-head'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'di/fast-import-doc'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'jn/plug-empty-tree-leak'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'ac/describe-dirty-refresh'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'di/parse-options-split'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'js/i18n-scripts'
blob
|
commitdiff
|
raw
2011-08-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-08-24
Junio C Hamano
Sync with 1.7.6.1
blob
|
commitdiff
|
raw
2011-08-23
Junio C Hamano
Merge branch 'rt/zlib-smaller-window'
blob
|
commitdiff
|
raw
2011-08-23
Junio C Hamano
Merge branch 'jn/maint-test-return'
blob
|
commitdiff
|
raw
2011-08-23
Junio C Hamano
Merge branch 'cb/maint-ls-files-error-report'
blob
|
commitdiff
|
raw
2011-08-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-08-23
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-08-19
Junio C Hamano
Merge branch 'db/am-skip-blank-at-the-beginning'
blob
|
commitdiff
|
raw
2011-08-19
Junio C Hamano
Merge branch 'ma/am-exclude'
blob
|
commitdiff
|
raw
2011-08-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2011-08-18
Junio C Hamano
Merge branch 'mh/check-attr-relative'
blob
|
commitdiff
|
raw
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-11
Junio C Hamano
Merge branch 'jk/fast-export-quote-path'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-04
Michael Haggerty
Rename git_checkattr() to git_check_attr()
blob
|
commitdiff
|
raw
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 '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 '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-07-06
Junio C Hamano
Merge commit 'v1.6.0' into jc/checkout-reflog-fix
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-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-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-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 '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 'rg/copy-gecos-username' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
