Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
userdiff: add a builtin pattern for dts files
[gitweb.git]
/
t
/
t6037-merge-ours-theirs.sh
2018-03-22
Merge branch 'cl/t9001-cleanup' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'bw/oidmap-autoinit' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'sg/test-i18ngrep' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'jt/fsck-code-cleanup' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'ew/svn-branch-segfault-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'nd/list-merge-strategy' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'jk/daemon-fixes' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'tg/split-index-fixes' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'mr/packed-ref-store-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'jt/http-redact-cookies' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'nd/diff-flush-before-warning' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'sg/travis-build-during-script-phase'...
blob
|
diff
|
raw
2018-03-21
Merge branch 'ml/filter-branch-portability-fix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'dp/merge-strategy-doc-fix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'ks/t3200-typofix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'jh/fsck-promisors'
blob
|
diff
|
raw
2018-03-21
Merge branch 'master' of https://github.com/Softcatala...
blob
|
diff
|
raw
2018-03-15
Merge branch 'cl/send-email-reply-to'
blob
|
diff
|
raw
2018-03-15
Merge branch 'np/send-email-header-parsing'
blob
|
diff
|
raw
2018-03-14
Merge branch 'nd/worktree-move'
blob
|
diff
|
raw
2018-03-14
Merge branch 'pw/add-p-recount'
blob
|
diff
|
raw
2018-03-14
Merge branch 'rj/test-i18ngrep'
blob
|
diff
|
raw
2018-03-14
Merge branch 'nd/diff-stat-with-summary'
blob
|
diff
|
raw
2018-03-13
Merge branch 'jt/binsearch-with-fanout' into HEAD
blob
|
diff
|
raw
2018-03-08
Merge branch 'mk/doc-pretty-fill'
blob
|
diff
|
raw
2018-03-08
Merge branch 'ds/mark-parents-uninteresting-optim'
blob
|
diff
|
raw
2018-03-08
Merge branch 'ds/find-unique-abbrev-optim'
blob
|
diff
|
raw
2018-03-08
Merge branch 'ot/ref-filter-cleanup'
blob
|
diff
|
raw
2018-03-08
Merge branch 'jh/status-no-ahead-behind'
blob
|
diff
|
raw
2018-03-08
Merge branch 'sg/travis-build-during-script-phase'
blob
|
diff
|
raw
2018-03-06
Merge branch 'rs/strbuf-read-file-or-whine'
blob
|
diff
|
raw
2018-03-06
Merge branch 'ab/simplify-perl-makefile'
blob
|
diff
|
raw
2018-03-06
Merge branch 'sg/t6300-modernize'
blob
|
diff
|
raw
2018-03-06
Merge branch 'sb/color-h-cleanup'
blob
|
diff
|
raw
2018-03-06
Merge branch 'xz/send-email-batch-size'
blob
|
diff
|
raw
2018-03-06
Merge branch 'ab/fetch-prune'
blob
|
diff
|
raw
2018-03-06
Merge branch 'sm/mv-dry-run-update'
blob
|
diff
|
raw
2018-03-06
Merge branch 'nm/tag-edit'
blob
|
diff
|
raw
2018-03-06
Merge branch 'cb/ttk-style' of git-gui into cb/git...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bb/ssh-key-files' of git-gui into bb...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bp/bind-kp-enter' of git-gui into bp...
blob
|
diff
|
raw
2018-02-28
Merge branch 'tz/do-not-clean-spec-file'
blob
|
diff
|
raw
2018-02-28
Merge branch 'tg/worktree-create-tracking'
blob
|
diff
|
raw
2018-02-28
Merge branch 'gs/test-unset-xdg-cache-home'
blob
|
diff
|
raw
2018-02-28
Merge branch 'tk/apply-dev-null-verify-name-fix'
blob
|
diff
|
raw
2018-02-28
Merge branch 'sb/status-doc-fix'
blob
|
diff
|
raw
2018-02-28
Merge branch 'es/worktree-add-post-checkout-hook'
blob
|
diff
|
raw
2018-02-27
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-02-27
Merge branch 'sb/submodule-update-reset-fix' into maint
blob
|
diff
|
raw
2018-02-27
Merge branch 'ab/commit-m-with-fixup' into maint
blob
|
diff
|
raw
2018-02-27
Merge branch 'nd/ita-wt-renames-in-status' into maint
blob
|
diff
|
raw
2018-02-27
Merge branch 'jt/binsearch-with-fanout'
blob
|
diff
|
raw
2018-02-27
Merge branch 'rd/typofix'
blob
|
diff
|
raw
2018-02-27
Merge branch 'jk/test-hashmap-updates'
blob
|
diff
|
raw
2018-02-27
Merge branch 'jk/sq-dequote-on-bogus-input'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bp/fsmonitor'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bc/doc-interpret-trailers-grammofix'
blob
|
diff
|
raw
2018-02-27
Merge branch 'sg/doc-test-must-fail-args'
blob
|
diff
|
raw
2018-02-27
Merge branch 'sb/describe-blob'
blob
|
diff
|
raw
2018-02-27
Merge branch 'rs/check-ignore-multi'
blob
|
diff
|
raw
2018-02-27
Merge branch 'rj/sparse-updates'
blob
|
diff
|
raw
2018-02-27
Merge branch 'js/packet-read-line-check-null'
blob
|
diff
|
raw
2018-02-27
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
blob
|
diff
|
raw
2018-02-27
Merge branch 'jk/gettext-poison'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bp/name-hash-dirname-fix'
blob
|
diff
|
raw
2018-02-27
Merge branch 'ab/untracked-cache-invalidation-docs'
blob
|
diff
|
raw
2018-02-27
Merge branch 'nd/fix-untracked-cache-invalidation'
blob
|
diff
|
raw
2018-02-21
Merge branch 'sg/test-i18ngrep'
blob
|
diff
|
raw
2018-02-21
Merge branch 'lw/daemon-log-destination'
blob
|
diff
|
raw
2018-02-21
Merge branch 'merge' of https://github.com/ChrisADR...
blob
|
diff
|
raw
2018-02-15
Merge branch 'ab/doc-cat-file-e-still-shows-errors...
blob
|
diff
|
raw
2018-02-15
Merge branch 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'nd/add-i-ignore-submodules' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'tg/stash-with-pathspec-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jk/abort-clone-with-existing-dest' into...
blob
|
diff
|
raw
2018-02-15
Merge branch 'jc/merge-symlink-ours-theirs' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'nd/ignore-glob-doc-update'
blob
|
diff
|
raw
2018-02-15
Merge branch 'tg/reset-hard-show-head-with-pretty'
blob
|
diff
|
raw
2018-02-15
Merge branch 'rs/cocci-strbuf-addf-to-addstr'
blob
|
diff
|
raw
2018-02-15
Merge branch 'ab/wildmatch-tests'
blob
|
diff
|
raw
2018-02-15
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
2018-02-15
Merge branch 'kg/packed-ref-cache-fix'
blob
|
diff
|
raw
2018-02-15
Merge branch 'jt/fsck-code-cleanup'
blob
|
diff
|
raw
2018-02-15
Merge branch 'en/merge-recursive-fixes'
blob
|
diff
|
raw
2018-02-15
Merge branch 'jc/worktree-add-short-help'
blob
|
diff
|
raw
2018-02-15
Merge branch 'ab/sha1dc-build'
blob
|
diff
|
raw
2018-02-13
Merge branch 'tz/doc-show-defaults-to-head'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ew/svn-branch-segfault-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'pw/sequencer-in-process-commit'
blob
|
diff
|
raw
2018-02-13
Merge branch 'nd/list-merge-strategy'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jk/daemon-fixes'
blob
|
diff
|
raw
2018-02-13
Merge branch 'nd/shared-index-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'po/http-push-error-message'
blob
|
diff
|
raw
2018-02-13
Merge branch 'po/clang-format-functype-weight'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jc/mailinfo-cleanup-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'sg/cocci-move-array'
blob
|
diff
|
raw
2018-02-13
Merge branch 'tg/split-index-fixes'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rs/strbuf-cocci-workaround'
blob
|
diff
|
raw
2018-02-13
Merge branch 'mr/packed-ref-store-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jt/http-redact-cookies'
blob
|
diff
|
raw
next