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 'bg/maint-remote-update-default' into maint
[git.git]
/
Documentation
/
merge-options.txt
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-add-p-empty' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'js/maint-diff-color-words' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'tz/maint-rpm' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-format-patch-p-suppress-stat...
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'pb/maint-gitweb-blob-lineno' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'vl/maint-openssl-signature-change' into...
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-push-config' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'sr/blame-incomplete' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'bs/maint-pre-commit-hook-sample'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'js/maint-diff-color-words'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'rs/pretty-wrap'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'js/log-rewrap'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'fc/doc-fast-forward'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'sc/difftool-p4merge'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'jk/maint-add-p-empty'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-16
Junio C Hamano
Merge branch 'lt/revision-bisect'
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
2009-11-16
Junio C Hamano
Merge branch 'tr/maint-roff-quote' into maint
blob
|
commitdiff
|
raw
2009-11-16
Junio C Hamano
Merge branch 'ja/fetch-doc' into maint
blob
|
commitdiff
|
raw
2009-11-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-format-patch-p-suppress-stat'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'pb/maint-gitweb-blob-lineno'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'tr/describe-advice'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'bg/merge-ff-only'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'vl/maint-openssl-signature-change'
blob
|
commitdiff
|
raw
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-push-config'
blob
|
commitdiff
|
raw
2009-11-10
Junio C Hamano
Merge branch 'jk/gitignore-anchored'
blob
|
commitdiff
|
raw
2009-11-10
Junio C Hamano
Merge branch 'jp/dirty-describe'
blob
|
commitdiff
|
raw
2009-11-10
Junio C Hamano
Merge branch 'sr/blame-incomplete'
blob
|
commitdiff
|
raw
2009-11-10
Junio C Hamano
Merge branch 'jn/maint-http-fetch-mingw' into jn/help...
blob
|
commitdiff
|
raw
2009-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-11-07
Junio C Hamano
Merge branch 'jc/commit-s-subject-is-not-a-footer'
blob
|
commitdiff
|
raw
2009-11-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-11-02
Junio C Hamano
Merge branch 'jn/show-normalized-refs'
blob
|
commitdiff
|
raw
2009-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
fixup tr/stash-format merge
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'js/diff-verbose-submodule'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'jc/checkout-auto-track'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'jn/show-normalized-refs'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'ak/bisect-reset-to-switch'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'tr/maint-roff-quote'
blob
|
commitdiff
|
raw
2009-10-31
Junio C Hamano
Merge branch 'ja/fetch-doc'
blob
|
commitdiff
|
raw
2009-10-30
Björn Gustavsson
Teach 'git merge' and 'git pull' the option --ff-only
blob
|
commitdiff
|
raw
|
diff to current
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
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 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-22
Jari Aalto
Documentation/merge-options.txt: order options in alpha...
blob
|
commitdiff
|
raw
2009-10-19
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
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-16
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line' 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-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-1.6.2' into maint-1.6.3
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-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.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-26
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-21
Junio C Hamano
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-19
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-16
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-08-11
Junio C Hamano
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-08
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-08-08
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-07-29
Junio C Hamano
Merge branch 'hv/cvsps-tests'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'cc/bisect'
blob
|
commitdiff
|
raw
|
diff to current
2009-07-02
Junio C Hamano
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-22
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'ph/submodule-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'jc/cache-tree'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-21
Junio C Hamano
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'cc/bisect' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'rc/maint-http-local-slot-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'ph/submodule-rebase' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Junio C Hamano
Merge branch 'da/araxis-mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2009-06-11
Junio C Hamano
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-02
Junio C Hamano
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-06-02
Junio C Hamano
Merge branch 'rs/maint-grep-word-regexp-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
