Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
git-p4: add failing test for P4EDITOR handling
[gitweb.git]
/
Documentation
/
merge-options.txt
2014-06-25
Merge branch 'jk/repack-pack-keep-objects'
blob
|
diff
|
raw
2014-06-25
Merge branch 'na/no-http-test-in-the-middle' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'jl/status-added-submodule-is-never-ignore...
blob
|
diff
|
raw
2014-06-25
Merge branch 'ym/fix-opportunistic-index-update-race...
blob
|
diff
|
raw
2014-06-25
Merge branch 'mk/show-s-no-extra-blank-line-for-merges...
blob
|
diff
|
raw
2014-06-25
Merge branch 'rr/rebase-autostash-fix' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'jc/shortlog-ref-exclude' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'fc/rerere-conflict-style' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'rs/mailinfo-header-cmp' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'nd/index-pack-one-fd-per-thread' into...
blob
|
diff
|
raw
2014-06-25
Merge branch 'sk/spawn-less-case-insensitively-from...
blob
|
diff
|
raw
2014-06-25
Merge branch 'nd/daemonize-gc' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'jk/diff-follow-must-take-one-pathspec...
blob
|
diff
|
raw
2014-06-25
Merge branch 'jk/diff-files-assume-unchanged' into...
blob
|
diff
|
raw
2014-06-25
Merge branch 'jk/commit-C-pick-empty' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'bc/blame-crlf-test' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'jc/apply-ignore-whitespace' into maint
blob
|
diff
|
raw
2014-06-25
Merge branch 'jc/revision-dash-count-parsing' into...
blob
|
diff
|
raw
2014-06-25
Merge branch 'jk/report-fail-to-read-objects-better...
blob
|
diff
|
raw
2014-06-20
Merge branch 'jc/test-lazy-prereq' (early part)
blob
|
diff
|
raw
2014-06-20
Merge branch 'tb/t5551-clone-notice-to-stderr'
blob
|
diff
|
raw
2014-06-20
Merge branch 'jc/revision-dash-count-parsing'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/error-resolve-conflict-advice'
blob
|
diff
|
raw
2014-06-16
Merge branch 'nd/daemonize-gc'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jl/status-added-submodule-is-never-ignored'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/daemon-tolower'
blob
|
diff
|
raw
2014-06-16
Merge branch 'jk/diff-follow-must-take-one-pathspec'
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 'mt/patch-id-stable' (early part)
blob
|
diff
|
raw
2014-06-12
Merge branch 'jc/rev-parse-argh-dashed-multi-words...
blob
|
diff
|
raw
2014-06-09
Merge branch 'jc/shortlog-ref-exclude'
blob
|
diff
|
raw
2014-06-09
Merge branch 'rs/mailinfo-header-cmp'
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 '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 '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 'tb/unicode-6.3-zero-width'
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 'fc/status-printf-squelch-format-zero...
blob
|
diff
|
raw
2014-06-06
Merge branch 'jk/commit-C-pick-empty'
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 'nd/index-pack-one-fd-per-thread'
blob
|
diff
|
raw
2014-06-03
Merge branch 'ym/fix-opportunistic-index-update-race'
blob
|
diff
|
raw
2014-06-03
Merge branch 'mh/ref-transaction'
blob
|
diff
|
raw
2014-06-03
Merge branch 'ks/tree-diff-nway'
blob
|
diff
|
raw
2014-06-03
Merge branch 'jc/apply-ignore-whitespace'
blob
|
diff
|
raw
2014-06-03
Merge branch 'as/grep-fullname-config'
blob
|
diff
|
raw
2014-05-28
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
blob
|
diff
|
raw
2014-05-28
Merge branch 'mw/symlinks' into maint
blob
|
diff
|
raw
2014-05-19
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
blob
|
diff
|
raw
2014-05-19
Merge branch 'lt/request-pull'
blob
|
diff
|
raw
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
2014-05-19
Merge branch 'kb/fast-hashmap'
blob
|
diff
|
raw
2014-05-08
Merge branch 'cl/p4-use-diff-tree' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
blob
|
diff
|
raw
2014-05-08
Merge branch 'tb/unicode-6.3-zero-width' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'km/avoid-bs-in-shell-glob' into maint
blob
|
diff
|
raw
2014-05-08
Merge branch 'km/avoid-cp-a' into maint
blob
|
diff
|
raw
2014-05-07
Merge branch 'cl/p4-use-diff-tree'
blob
|
diff
|
raw
2014-05-02
Merge branch 'mw/symlinks'
blob
|
diff
|
raw
2014-05-02
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
blob
|
diff
|
raw
2014-04-24
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
2014-04-21
Merge branch 'ep/shell-command-substitution'
blob
|
diff
|
raw
2014-04-18
Merge branch 'jk/config-die-bad-number-noreturn'
blob
|
diff
|
raw
2014-04-16
Merge branch 'mh/multimail'
blob
|
diff
|
raw
2014-04-16
Merge branch 'tb/unicode-6.3-zero-width'
blob
|
diff
|
raw
2014-04-16
Merge branch 'km/avoid-cp-a'
blob
|
diff
|
raw
2014-04-16
Merge branch 'km/avoid-bs-in-shell-glob'
blob
|
diff
|
raw
2014-04-09
Merge branch 'jl/nor-or-nand-and' into maint
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 'maint'
blob
|
diff
|
raw
2014-04-08
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
2014-04-08
Merge branch 'jl/nor-or-nand-and'
blob
|
diff
|
raw
2014-04-08
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'mh/remove-subtree-long-pathname-fix'...
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'jc/stash-pop-not-popped' into maint
blob
|
diff
|
raw
|
diff to current
2014-04-03
Merge branch 'nd/log-show-linear-break'
blob
|
diff
|
raw
|
diff to current
2014-04-02
Merge branch 'ap/remote-hg-skip-null-bookmarks'
blob
|
diff
|
raw
|
diff to current
2014-03-31
Merge branch 'wt/doc-submodule-name-path-confusion-2'
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-31
Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
blob
|
diff
|
raw
|
diff to current
2014-03-31
Documentation: fix misuses of "nor"
blob
|
diff
|
raw
2014-03-28
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
|
diff to current
2014-03-25
Merge branch 'dm/configure-iconv-locale-charset'
blob
|
diff
|
raw
|
diff to current
2014-03-25
Merge branch 'jk/warn-on-object-refname-ambiguity'
blob
|
diff
|
raw
|
diff to current
2014-03-25
Merge branch 'mh/remove-subtree-long-pathname-fix'
blob
|
diff
|
raw
|
diff to current
2014-03-25
Merge branch 'nd/indent-fix-connect-c'
blob
|
diff
|
raw
|
diff to current
2014-03-25
Merge branch 'cp/am-patch-format-doc'
blob
|
diff
|
raw
|
diff to current
2014-03-21
Merge branch 'lt/request-pull'
blob
|
diff
|
raw
|
diff to current
2014-03-21
Merge branch 'es/sh-i18n-envsubst'
blob
|
diff
|
raw
|
diff to current
2014-03-21
Merge branch 'jc/stash-pop-not-popped'
blob
|
diff
|
raw
|
diff to current
next