tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Improve the mingw getaddrinfo stub to handle more use cases
[git.git]
/
Documentation
/
git-mergetool.txt
2010-10-27
Junio C Hamano
Merge branch 'ab/send-email-perl'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'sb/send-email-use-to-from-input'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'ab/require-perl-5.8'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'kb/merge-recursive-rename-threshold'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'jp/send-email-to-cmd'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'as/daemon-multi-listen'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'dm/mergetool-vimdiff'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'kf/post-receive-sample-hook'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'jf/merge-ignore-ws'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'ml/completion-zsh'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'po/sendemail'
blob
|
commitdiff
|
raw
2010-10-27
Junio C Hamano
Merge branch 'en/tree-walk-optim'
blob
|
commitdiff
|
raw
2010-10-22
Junio C Hamano
Sync with 1.7.3.2
blob
|
commitdiff
|
raw
2010-10-21
Junio C Hamano
Merge branch 'sn/doc-opt-notation' into maint
blob
|
commitdiff
|
raw
2010-10-08
Štěpán Němec
Use parentheses and `...' where appropriate
blob
|
commitdiff
|
raw
2010-09-29
Junio C Hamano
Merge branch 'rr/format-patch-count-without-merges'
blob
|
commitdiff
|
raw
|
diff to current
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-08
Junio C Hamano
Merge branch 'bc/maint-fetch-url-only'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-08
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
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-03
Junio C Hamano
Merge branch 'jn/merge-renormalize'
blob
|
commitdiff
|
raw
|
diff to current
2010-09-01
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs' into...
blob
|
commitdiff
|
raw
|
diff to current
2010-09-01
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used' into maint
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-31
Junio C Hamano
Merge branch 'jn/cherry-revert-message-clean-up'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-31
Junio C Hamano
Merge branch 'en/d-f-conflict-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-31
Junio C Hamano
Merge branch 'en/fast-export-fix'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-31
Junio C Hamano
Merge branch 'hv/autosquash-config'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-31
Junio C Hamano
Merge branch 'sg/rerere-gc-old-still-used'
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 'hv/submodule-find-ff-merge'
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-20
Junio C Hamano
Merge branch 'tr/rfc-reset-doc' into maint
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 'tf/string-list-init'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'kf/post-receive-sample-hook'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'ab/report-corrupt-object-with-type'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'jn/fast-import-subtree'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'ar/string-list-foreach'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-18
Junio C Hamano
Merge branch 'jh/graph-next-line'
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-18
Junio C Hamano
Merge branch 'tc/checkout-B'
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 'tr/rfc-reset-doc'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-13
Junio C Hamano
Merge branch 'jn/parse-date-basic'
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-03
Junio C Hamano
Merge branch 'gp/pack-refs-remove-empty-dirs'
blob
|
commitdiff
|
raw
|
diff to current
2010-08-03
Junio C Hamano
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-03
Junio C Hamano
Merge branch 'rr/svn-fe' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-08-02
Junio C Hamano
Merge branch 'ab/tap' into maint
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-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2010-07-19
David Aguilar
Documentation: Explain git-mergetool's use of temporary...
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-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 'hg/maint-attr-fix' into maint
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 '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 'sp/maint-describe-tiebreak-with-tagger...
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 'jc/maint-reflog-expire-unreachable'
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-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 'jk/maint-diffstat-overflow'
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-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 'cp/add-u-pathspec' into maint
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-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
next