Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ew/config-protect-mode'
[gitweb.git]
/
Documentation
/
git-merge.txt
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-06-03
Merge branch 'mm/mediawiki-encoding-fix'
blob
|
diff
|
raw
2014-06-03
Merge branch 'sk/tag-contains-wo-recursion'
blob
|
diff
|
raw
2014-06-03
Merge branch 'ef/send-email-absolute-path-to-the-command'
blob
|
diff
|
raw
2014-06-03
Merge branch 'jx/blame-align-relative-time'
blob
|
diff
|
raw
2014-06-03
Merge branch 'lr/git-run-setup-gently'
blob
|
diff
|
raw
2014-06-03
Merge branch 'fc/mergetools-vimdiff3'
blob
|
diff
|
raw
2014-06-03
Merge branch 'fc/merge-default-to-upstream'
blob
|
diff
|
raw
2014-06-03
Merge branch 'jk/external-diff-use-argv-array'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'sk/svn-parse-datestamp'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'nd/index-pack-one-fd-per-thread'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'ym/fix-opportunistic-index-update-race'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'mh/ref-transaction'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'ks/tree-diff-nway'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'jc/apply-ignore-whitespace'
blob
|
diff
|
raw
|
diff to current
2014-06-03
Merge branch 'as/grep-fullname-config'
blob
|
diff
|
raw
|
diff to current
2014-05-30
Sync with 1.9.4
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'lt/request-pull'
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'kb/fast-hashmap'
blob
|
diff
|
raw
|
diff to current
2014-05-09
Sync with 1.9.3
blob
|
diff
|
raw
|
diff to current
2014-05-08
Sync with maint
blob
|
diff
|
raw
|
diff to current
2014-05-07
Merge branch 'cl/p4-use-diff-tree'
blob
|
diff
|
raw
|
diff to current
2014-05-02
Merge branch 'mw/symlinks'
blob
|
diff
|
raw
|
diff to current
2014-05-02
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
blob
|
diff
|
raw
|
diff to current
2014-04-28
Merge branch 'jk/external-diff-use-argv-array' (early...
blob
|
diff
|
raw
|
diff to current
2014-04-24
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
|
diff to current
2014-04-22
merge: enable defaulttoupstream by default
blob
|
diff
|
raw
2014-04-21
Merge branch 'km/avoid-non-function-return-in-rebase'
blob
|
diff
|
raw
|
diff to current
2014-04-21
Merge branch 'ep/shell-command-substitution'
blob
|
diff
|
raw
|
diff to current
2014-04-18
Merge branch 'jk/config-die-bad-number-noreturn'
blob
|
diff
|
raw
|
diff to current
2014-04-18
Merge branch 'fc/remote-helper-fixes'
blob
|
diff
|
raw
|
diff to current
2014-04-16
Merge branch 'mh/multimail'
blob
|
diff
|
raw
|
diff to current
2014-04-16
Merge branch 'tb/unicode-6.3-zero-width'
blob
|
diff
|
raw
|
diff to current
2014-04-16
Merge branch 'km/avoid-cp-a'
blob
|
diff
|
raw
|
diff to current
2014-04-16
Merge branch 'km/avoid-bs-in-shell-glob'
blob
|
diff
|
raw
|
diff to current
2014-04-09
Sync with 1.9.2
blob
|
diff
|
raw
|
diff to current
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
|
diff to current
2014-04-08
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'jl/nor-or-nand-and'
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'mh/update-ref-batch-create-fix'
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'mr/opt-set-ptr'
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'ib/rev-parse-parseopt-argh'
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'mr/msvc-link-with-invalidcontinue'
blob
|
diff
|
raw
|
diff to current
2014-04-08
Merge branch 'jc/rev-parse-argh-dashed-multi-words'
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-31
Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
blob
|
diff
|
raw
|
diff to current
2014-03-24
parse-options: multi-word argh should use dash to separ...
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-27
Merge branch 'kb/fast-hashmap'
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-13
Merge branch 'sb/repack-in-c' 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-02-05
Merge branch 'tb/repack-fix-renames' (early part)
blob
|
diff
|
raw
|
diff to current
2014-01-27
Merge branch 'sb/repack-in-c'
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 'mh/attr-macro-doc'
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 'rs/doc-submitting-patches' into maint
blob
|
diff
|
raw
|
diff to current
2013-12-17
Merge branch 'tr/doc-git-cherry' into maint
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-17
Merge branch 'nd/magic-pathspec' into maint
blob
|
diff
|
raw
|
diff to current
2013-12-12
Merge branch 'rs/doc-submitting-patches'
blob
|
diff
|
raw
|
diff to current
2013-12-12
Merge branch 'tr/doc-git-cherry'
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-06
Merge branch 'nd/magic-pathspec'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jn/mediawiki-makefile-updates'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jc/ref-excludes'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'bc/http-100-continue'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jc/merge-base-reflog'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jk/replace-perl-in-built-scripts'
blob
|
diff
|
raw
|
diff to current
2013-12-05
Merge branch 'jk/robustify-parse-commit'
blob
|
diff
|
raw
|
diff to current
next