Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jm/t9138-style-fix'
[gitweb.git]
/
Documentation
/
git-mergetool.txt
2014-06-16
Merge branch 'jm/t9138-style-fix'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jm/instaweb-apache-24'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jl/remote-rm-prune'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/complete-merge-pull'
blob
|
diff
|
raw
2014-06-16
Merge branch 'bg/xcalloc-nmemb-then-size'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jl/status-added-submodule-is-never-ignored'
blob
|
diff
|
raw
2014-06-16
Merge branch 'cb/byte-order'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/strbuf-tolower'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/daemon-tolower'
blob
|
diff
|
raw
2014-06-16
Merge branch 'as/pretty-truncate'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/diff-follow-must-take-one-pathspec'
blob
|
diff
|
raw
2014-06-16
Merge branch 'sk/windows-unc-path'
blob
|
diff
|
raw
2014-06-16
Merge branch 'rr/rebase-autostash-fix'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/report-fail-to-read-objects-better'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/diff-files-assume-unchanged'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/argv-array-for-child-process'
blob
|
diff
|
raw
2014-06-16
Merge branch 'sk/wincred'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/do-not-run-httpd-tests-as-root'
blob
|
diff
|
raw
2014-06-16
Merge branch 'cc/replace-edit'
blob
|
diff
|
raw
2014-06-16
Merge branch 'mt/patch-id-stable' (early part)
blob
|
diff
|
raw
2014-06-12
Sync with maint
blob
|
diff
|
raw
2014-06-09
Merge branch 'jc/shortlog-ref-exclude'
blob
|
diff
|
raw
2014-06-09
Merge branch 'mn/sideband-no-ansi'
blob
|
diff
|
raw
2014-06-09
Merge branch 'rs/mailinfo-header-cmp'
blob
|
diff
|
raw
2014-06-09
Merge branch 'pb/trim-trailing-spaces'
blob
|
diff
|
raw
2014-06-09
Merge branch 'na/no-http-test-in-the-middle'
blob
|
diff
|
raw
2014-06-09
Merge branch 'jc/rev-parse-argh-dashed-multi-words'
blob
|
diff
|
raw
2014-06-09
Merge branch 'lt/request-pull'
blob
|
diff
|
raw
2014-06-06
Merge branch 'ss/howto-manage-trunk'
blob
|
diff
|
raw
2014-06-06
Merge branch 'mc/git-p4-prepare-p4-only'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jn/test-lint-unmoor'
blob
|
diff
|
raw
2014-06-06
Merge branch 'ep/shell-assign-and-export-vars'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jj/command-line-adjective'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jc/coding-guidelines'
blob
|
diff
|
raw
2014-06-06
Merge branch 'nd/status-auto-comment-char'
blob
|
diff
|
raw
2014-06-06
Merge branch 'mt/rebase-i-keep-empty-test'
blob
|
diff
|
raw
2014-06-06
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
blob
|
diff
|
raw
2014-06-06
Merge branch 'sk/spawn-less-case-insensitively-from...
blob
|
diff
|
raw
2014-06-06
Merge branch 'jd/subtree'
blob
|
diff
|
raw
2014-06-06
Merge branch 'wk/doc-clarify-upstream'
blob
|
diff
|
raw
2014-06-06
Merge branch 'tb/unicode-6.3-zero-width'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jk/index-pack-report-missing'
blob
|
diff
|
raw
2014-06-06
Merge branch 'bc/blame-crlf-test'
blob
|
diff
|
raw
2014-06-06
Merge branch 'sk/submodules-absolute-path-on-windows'
blob
|
diff
|
raw
2014-06-06
Merge branch 'dk/blame-reorg'
blob
|
diff
|
raw
2014-06-06
Merge branch 'wg/svn-fe-style-fixes'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jn/contrib-remove-vim'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jn/contrib-remove-diffall'
blob
|
diff
|
raw
2014-06-06
Merge branch 'dt/merge-recursive-case-insensitive'
blob
|
diff
|
raw
2014-06-06
Merge branch 'rs/reflog-exists'
blob
|
diff
|
raw
2014-06-06
Merge branch 'tg/tag-state-tag-name-in-editor-hints'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jk/grep-tell-run-command-to-cd-when-runni...
blob
|
diff
|
raw
2014-06-06
Merge branch 'fc/status-printf-squelch-format-zero...
blob
|
diff
|
raw
2014-06-06
Merge branch 'jk/squelch-compiler-warning-from-funny...
blob
|
diff
|
raw
2014-06-06
Merge branch 'dk/raise-core-deltabasecachelimit'
blob
|
diff
|
raw
2014-06-06
Merge branch 'tl/relax-in-poll-emulation'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jk/utf8-switch-between-nfd-and-nfc'
blob
|
diff
|
raw
2014-06-06
Merge branch 'da/imap-send-use-credential-helper'
blob
|
diff
|
raw
2014-06-06
Merge branch 'je/pager-do-not-recurse'
blob
|
diff
|
raw
2014-06-06
Merge branch 'jk/commit-C-pick-empty'
blob
|
diff
|
raw
2014-06-06
Merge branch 'mm/pager-less-sans-S'
blob
|
diff
|
raw
2014-06-03
Merge branch 'sk/msvc-dynlink-crt'
blob
|
diff
|
raw
2014-06-03
Merge branch 'ew/config-protect-mode'
blob
|
diff
|
raw
2014-06-03
Merge branch 'bg/strbuf-trim'
blob
|
diff
|
raw
2014-06-03
Merge branch 'jk/commit-date-approxidate'
blob
|
diff
|
raw
2014-06-03
Merge branch 'ep/shell-command-substitution'
blob
|
diff
|
raw
2014-06-03
Merge branch 'fc/rerere-conflict-style'
blob
|
diff
|
raw
2014-06-03
Merge branch 'dt/api-doc-setup-gently'
blob
|
diff
|
raw
2014-06-03
Merge branch 'fc/mergetool-prompt'
blob
|
diff
|
raw
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
|
diff to current
2014-04-24
mergetool: document the default for --[no-]prompt
blob
|
diff
|
raw
2014-04-09
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-04-09
Merge commit 'doc/http-backend: missing accent grave...
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
|
diff to current
2014-03-31
Merge branch 'wt/doc-submodule-name-path-confusion-1'
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jc/check-attr-honor-working-tree' into...
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'jk/config-path-include-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-03-18
Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
blob
|
diff
|
raw
|
diff to current
2014-03-14
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
|
diff to current
2014-03-14
Merge branch 'jc/check-attr-honor-working-tree'
blob
|
diff
|
raw
|
diff to current
2014-03-07
Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
blob
|
diff
|
raw
|
diff to current
2014-03-07
Merge branch 'jc/core-checkstat-2.0'
blob
|
diff
|
raw
|
diff to current
2014-03-07
Merge branch 'jc/add-2.0-ignore-removal'
blob
|
diff
|
raw
|
diff to current
2014-03-07
Merge branch 'jn/add-2.0-u-A-sans-pathspec'
blob
|
diff
|
raw
|
diff to current
2014-03-07
Merge branch 'jc/push-2.0-default-to-simple'
blob
|
diff
|
raw
|
diff to current
2014-02-27
Merge branch 'bs/stdio-undef-before-redef'
blob
|
diff
|
raw
|
diff to current
2014-02-27
Merge branch 'jk/config-path-include-fix'
blob
|
diff
|
raw
|
diff to current
2014-02-13
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
|
diff to current
2014-02-05
Merge branch 'jc/maint-pull-docfix' into maint
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'jc/maint-pull-docfix'
blob
|
diff
|
raw
|
diff to current
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
blob
|
diff
|
raw
|
diff to current
2013-12-17
Merge branch 'jk/two-way-merge-corner-case-fix' into...
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
|
diff to current
next