Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
update_unicode.sh: pin the uniset repo to a known good commit
[gitweb.git]
/
git-mergetool.sh
2014-12-17
Sync with v2.1.4
blob
|
diff
|
raw
2014-12-17
Sync with v2.0.5
blob
|
diff
|
raw
|
diff to current
2014-11-19
Merge branch 'sv/submitting-final-patch'
blob
|
diff
|
raw
2014-11-19
Merge branch 'sn/tutorial-status-output-example'
blob
|
diff
|
raw
2014-11-19
Merge branch 'mh/doc-remote-helper-xref'
blob
|
diff
|
raw
2014-11-19
Merge branch 'tb/no-relative-file-url'
blob
|
diff
|
raw
2014-11-19
Merge branch 'cc/interpret-trailers'
blob
|
diff
|
raw
2014-11-18
Merge branch 'jc/doc-commit-only'
blob
|
diff
|
raw
2014-11-18
Merge branch 'da/difftool'
blob
|
diff
|
raw
2014-11-12
Sync with 'maint'
blob
|
diff
|
raw
2014-11-12
Merge branch 'nd/gitignore-trailing-whitespace' into...
blob
|
diff
|
raw
|
diff to current
2014-11-12
Merge branch 'jk/fetch-reflog-df-conflict'
blob
|
diff
|
raw
2014-11-11
Sync with maint
blob
|
diff
|
raw
2014-11-11
Merge branch 'rs/clean-menu-item-defn' into maint
blob
|
diff
|
raw
|
diff to current
2014-11-10
Sync with maint
blob
|
diff
|
raw
2014-11-10
Merge branch 'js/diff-highlight-avoid-sigpipe'
blob
|
diff
|
raw
2014-11-06
Merge branch 'maint'
blob
|
diff
|
raw
2014-11-06
Merge branch 'nd/gitignore-trailing-whitespace'
blob
|
diff
|
raw
2014-11-06
Merge branch 'tm/line-log-first-parent'
blob
|
diff
|
raw
2014-11-06
Merge branch 'jk/fetch-reflog-df-conflict'
blob
|
diff
|
raw
2014-11-06
Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
blob
|
diff
|
raw
2014-10-31
Merge branch 'jc/push-cert'
blob
|
diff
|
raw
2014-10-31
Merge branch 'rs/child-process-init'
blob
|
diff
|
raw
2014-10-31
Merge branch 'rs/grep-color-words'
blob
|
diff
|
raw
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-10-29
Sync with Git 2.1.3
blob
|
diff
|
raw
2014-10-29
Merge branch 'jk/pack-objects-no-bitmap-when-splitting...
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'rm/gitweb-start-form' into maint
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'rs/daemon-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'da/difftool'
blob
|
diff
|
raw
2014-10-29
Merge branch 'rb/pack-window-memory-config-doc'
blob
|
diff
|
raw
2014-10-29
Merge branch 'mg/lib-gpg-ro-safety'
blob
|
diff
|
raw
2014-10-29
Merge branch 'dm/port2zos'
blob
|
diff
|
raw
2014-10-29
Merge branch 'oc/mergetools-beyondcompare'
blob
|
diff
|
raw
2014-10-29
Merge branch 'jk/prune-mtime'
blob
|
diff
|
raw
2014-10-29
Merge branch 'bc/asciidoctor'
blob
|
diff
|
raw
2014-10-24
Merge branch 'jc/push-cert'
blob
|
diff
|
raw
2014-10-24
Merge branch 'sb/plug-transport-leak'
blob
|
diff
|
raw
2014-10-24
Merge branch 'nd/dir-prep-exclude-cleanup'
blob
|
diff
|
raw
2014-10-24
Merge branch 'eb/no-pthreads'
blob
|
diff
|
raw
2014-10-24
Merge branch 'wk/t1304-wo-USER'
blob
|
diff
|
raw
2014-10-24
Merge branch 'tb/core-filemode-doc'
blob
|
diff
|
raw
2014-10-24
Merge branch 'rs/run-command-env-array'
blob
|
diff
|
raw
2014-10-24
Merge branch 'po/doc-status-markup'
blob
|
diff
|
raw
2014-10-24
Merge branch 'jk/pack-objects-no-bitmap-when-splitting'
blob
|
diff
|
raw
2014-10-21
Merge branch 'js/completion-hide-not-a-repo'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-meld'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-temporary-directory'
blob
|
diff
|
raw
2014-10-21
Merge branch 'da/mergetool-tool-help'
blob
|
diff
|
raw
|
diff to current
2014-10-21
Merge branch 'da/mergetool-temporary-filename'
blob
|
diff
|
raw
|
diff to current
2014-10-21
Merge branch 'da/mergetool-tests'
blob
|
diff
|
raw
|
diff to current
2014-10-20
Merge branch 'rm/gitweb-start-form'
blob
|
diff
|
raw
|
diff to current
2014-10-20
Merge branch 'rs/receive-pack-argv-leak-fix'
blob
|
diff
|
raw
|
diff to current
2014-10-16
Merge branch 'jc/completion-no-chdir'
blob
|
diff
|
raw
|
diff to current
2014-10-16
mergetool: add an option for writing to a temporary...
blob
|
diff
|
raw
|
diff to current
2014-10-16
mergetool: use more conservative temporary filenames
blob
|
diff
|
raw
|
diff to current
2014-10-15
difftool: don't assume that default sh is sane
blob
|
diff
|
raw
|
diff to current
2014-10-15
mergetool: don't require a work tree for --tool-help
blob
|
diff
|
raw
|
diff to current
2014-10-15
mergetool: use more conservative temporary filenames
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'rs/mailsplit'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'rs/sha1-array-test'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'sk/tag-contains-wo-recursion'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'rs/daemon-fixes'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'dt/cache-tree-repair'
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'so/rebase-doc-fork-point'
blob
|
diff
|
raw
|
diff to current
2014-10-08
Merge branch 'nd/archive-pathspec'
blob
|
diff
|
raw
|
diff to current
2014-10-07
Merge branch 'maint-2.0' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'jc/test-lazy-prereq'
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'jk/fsck-exit-code-fix' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'ta/config-add-to-empty-or-true-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'jk/index-pack-threading-races' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'so/rebase-doc' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-29
Merge branch 'sb/t6031-typofix'
blob
|
diff
|
raw
|
diff to current
2014-09-29
Merge branch 'sb/t9300-typofix'
blob
|
diff
|
raw
|
diff to current
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'et/spell-poll-infinite-with-minus-one...
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jk/prune-top-level-refs-after-packing...
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jk/fast-import-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion...
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'sp/pack-protocol-doc-on-shallow' into...
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jk/prompt-stash-could-be-packed' into...
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'rs/refresh-beyond-symlink' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'lf/bundle-exclusion' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jc/apply-ws-prefix' into maint
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jk/command-line-config-empty-string'...
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jk/fsck-exit-code-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'so/rebase-doc'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'ta/config-add-to-empty-or-true-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'sp/doc-update-index-cacheinfo'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'rs/export-strbuf-addchars'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'kb/perf-trace'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jc/parseopt-verify-short-name'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'tb/complete-diff-ignore-blank-lines'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jp/index-with-corrupt-stages'
blob
|
diff
|
raw
|
diff to current
2014-09-19
Merge branch 'jk/index-pack-threading-races'
blob
|
diff
|
raw
|
diff to current
2014-09-11
Merge branch 'jk/name-decoration-alloc'
blob
|
diff
|
raw
|
diff to current
2014-09-11
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
blob
|
diff
|
raw
|
diff to current
next