tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'hg/id-munging'
[git.git]
/
Documentation
/
git-merge.txt
2010-06-18
Junio C Hamano
Merge branch 'hg/id-munging'
blob
|
commitdiff
|
raw
2010-06-18
Junio C Hamano
Merge branch 'tc/merge-m-log'
blob
|
commitdiff
|
raw
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 'np/index-pack-memsave' 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-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/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 '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
2010-05-21
Junio C Hamano
Merge branch 'ar/config-from-command-line'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-21
Junio C Hamano
Merge branch 'em/checkout-orphan'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-10
Tay Ray Chuan
merge: --log appends shortlog to message if specified
blob
|
commitdiff
|
raw
2010-05-09
Junio C Hamano
Merge branch 'bg/apply-blank-trailing-context'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'bg/send-email-smtpdomain'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'rc/ls-remote-default'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'rc/maint-curl-helper'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'hg/maint-attr-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'eb/unpretty-b-format'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'ab/commit-empty-message'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'jc/test-sleepless'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'jc/maint-reflog-expire-unreachable'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'sd/log-decorate'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'mh/status-optionally-refresh'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'cw/ws-indent-with-tab'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'cc/revert-strategy'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'sc/http-late-auth'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'jk/cached-textconv'
blob
|
commitdiff
|
raw
|
diff to current
2010-05-09
Junio C Hamano
Merge branch 'pc/remove-warn'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-23
Junio C Hamano
Merge branch 'mg/use-default-abbrev-length-in-rev-list...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-23
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflow' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-23
Junio C Hamano
Merge branch 'da/maint-python-startup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge branch 'rr/remote-helper-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflow'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge branch 'jg/auto-initialize-notes-with-percent...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-19
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2010-04-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-12
Marc Branchaud
Docs: Add -X option to git-merge's synopsis.
blob
|
commitdiff
|
raw
|
diff to current
2010-04-11
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'jc/conflict-marker-size' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-04-10
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-06
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
|
diff to current
2010-04-03
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-31
Junio C Hamano
Merge branch 'jc/maint-refs-dangling' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-29
Junio C Hamano
Merge branch 'sb/notes-parse-opt'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-29
Junio C Hamano
Merge branch 'cp/add-u-pathspec' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'tr/notes-display'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'jc/maint-refs-dangling'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'jc/color-attrs' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-24
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-22
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-20
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-20
Junio C Hamano
Merge branch 'jc/color-attrs'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-15
Junio C Hamano
Merge branch 'jh/notes'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-10
Junio C Hamano
Merge branch 'cp/add-u-pathspec'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'jk/maint-push-tracking-wo-remote' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'jk/maint-add--interactive-delete' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'jc/grep-author-all-match-implicit' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-08
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-push-tracking-wo-remote'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'nd/root-git'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-add--interactive-delete'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'rs/optim-text-wrap' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'cc/maint-bisect-paths' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-05
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-03
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-03
Junio C Hamano
Merge branch 'sp/maint-push-sideband' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-03
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'rs/optim-text-wrap'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-02
Junio C Hamano
Merge branch 'jc/grep-author-all-match-implicit'
blob
|
commitdiff
|
raw
|
diff to current
2010-03-01
Junio C Hamano
Merge branch 'cc/maint-bisect-paths'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-26
Junio C Hamano
Merge branch 'maint-1.6.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-24
Junio C Hamano
Merge branch 'ml/maint-grep-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-02-23
Junio C Hamano
Merge branch 'il/rev-glob'
blob
|
commitdiff
|
raw
|
diff to current
2010-02-21
Junio C Hamano
Merge branch 'ml/maint-grep-doc'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
