tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
lstat_cache: optionally return match_len
[git.git]
/
Documentation
/
merge-options.txt
2010-10-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'jk/repack-reuse-object'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'bc/fix-cherry-pick-root'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'uk/fix-author-ident-sed-script'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'cw/gitweb-hilite-config'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'ab/makefile-track-cc'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'mg/reset-doc'
blob
|
commitdiff
|
raw
2010-10-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-09-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'tr/send-email-refuse-sending-unedited...
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'ab/send-email-catfile'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'jc/grep-header-all-match-fix'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'jc/no-branch-name-with-dash-at-front'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'jn/gitweb-test-lib'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'bc/fortran-userdiff'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'jk/read-tree-empty'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'rr/format-patch-count-without-merges'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'jc/pickaxe-grep'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'gb/shell-ext'
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'rr/fmt-merge-msg'
blob
|
commitdiff
|
raw
2010-09-18
Junio C Hamano
Merge branch 'js/ls-files-x-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-15
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-09-09
Ramkumar Ramachandra
merge: Make '--log' an integer option for number of...
blob
|
commitdiff
|
raw
2010-09-06
Junio C Hamano
Merge branch 'xx/trivial' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-09-04
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-01
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'tr/xsize-bits' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-19
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'tr/xsize-bits'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-02
Junio C Hamano
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2010-07-27
Junio C Hamano
Sync with 1.7.0 series
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.6' into maint-1.7.0
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
commitdiff
|
raw
|
diff to current
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-09
Junio C Hamano
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-07-07
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'tc/commit-abbrev-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'cc/maint-diff-CC-binary' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-22
Junio C Hamano
Merge branch 'pc/remove-warn' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'js/maint-receive-pack-symref-alias'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'eb/core-eol'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'fg/autocrlf'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'tc/commit-abbrev-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'tr/receive-pack-aliased-update-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'js/async-thread'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'cb/assume-unchanged-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'rs/diff-no-minimal' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-21
Junio C Hamano
Merge branch 'bg/apply-blank-trailing-context' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-18
Junio C Hamano
Merge branch 'cc/maint-diff-CC-binary'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-18
Junio C Hamano
Merge branch 'rc/ls-remote-default'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-18
Junio C Hamano
Merge branch 'hg/id-munging'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'cw/maint-exec-defpath' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'sc/http-late-auth' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'cb/maint-stash-orphaned-file' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'jn/maint-bundle' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'rr/doc-submitting' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'jn/t7006-fixup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'jn/shortlog' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'np/index-pack-memsave' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'sp/maint-dumb-http-pack-reidx' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'jc/am-3-show-corrupted-patch' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'np/malloc-threading' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'bg/send-email-smtpdomain' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'rc/maint-curl-helper' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'hg/maint-attr-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-16
Junio C Hamano
Merge branch 'mh/status-optionally-refresh' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-06-13
Junio C Hamano
Merge branch 'js/try-to-free-stackable'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-13
Junio C Hamano
Merge branch 'cb/assume-unchanged-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-13
Junio C Hamano
Merge branch 'rs/diff-no-minimal'
blob
|
commitdiff
|
raw
|
diff to current
2010-06-01
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-05-28
Junio C Hamano
Merge branch 'maint-1.7.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'cb/maint-stash-orphaned-file'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jn/maint-bundle'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'rr/doc-submitting'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jn/gitweb-our-squelch'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jn/shortlog'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jn/t7006-fixup'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'js/maint-receive-pack-symref-alias'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'sp/maint-dumb-http-pack-reidx'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jn/submodule-basic-test'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'np/index-pack-memsave'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jc/am-3-show-corrupted-patch'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jc/maint-no-reflog-expire-unreach-for...
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'cw/maint-exec-defpath'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'tr/word-diff'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'jc/status-show-ignored'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'np/malloc-threading'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'sr/remote-helper-export'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'ld/discovery-limit-to-fs' (early part)
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
