Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
user-manual: Standardize backtick quoting
[gitweb.git]
/
git-mergetool--lib.sh
2013-02-25
Sync with 'maint'
blob
|
diff
|
raw
2013-02-25
Merge branch 'wk/user-manual'
blob
|
diff
|
raw
2013-02-25
Merge branch 'jn/less-reconfigure'
blob
|
diff
|
raw
2013-02-25
Merge branch 'as/check-ignore'
blob
|
diff
|
raw
2013-02-25
Merge branch 'ct/autoconf-htmldir'
blob
|
diff
|
raw
2013-02-25
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
diff
|
raw
2013-02-25
Merge branch 'jc/mention-tracking-for-pull-default...
blob
|
diff
|
raw
|
diff to current
2013-02-25
Merge branch 'al/mergetool-printf-fix' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-25
Merge branch 'mg/bisect-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-25
Merge branch 'jc/combine-diff-many-parents' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-25
Merge branch 'jk/apply-similaritly-parsing' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-25
Merge branch 'nd/clone-no-separate-git-dir-with-bare...
blob
|
diff
|
raw
|
diff to current
2013-02-20
Sync with v1.8.1.4
blob
|
diff
|
raw
2013-02-20
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-19
Merge branch 'jc/mention-tracking-for-pull-default'
blob
|
diff
|
raw
2013-02-19
Merge branch 'mm/config-intro-in-git-doc'
blob
|
diff
|
raw
2013-02-18
Merge branch 'maint'
blob
|
diff
|
raw
2013-02-17
Merge branch 'jc/hidden-refs'
blob
|
diff
|
raw
2013-02-17
Merge branch 'mp/diff-algo-config'
blob
|
diff
|
raw
2013-02-17
Merge branch 'jk/rebase-i-comment-char'
blob
|
diff
|
raw
2013-02-17
Merge branch 'jk/read-commit-buffer-data-after-free'
blob
|
diff
|
raw
2013-02-15
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
diff
|
raw
2013-02-15
Merge branch 'ef/non-ascii-parse-options-error-diag'
blob
|
diff
|
raw
2013-02-15
Merge branch 'da/p4merge-mktemp-fix'
blob
|
diff
|
raw
2013-02-14
Merge branch 'jk/diff-graph-cleanup'
blob
|
diff
|
raw
2013-02-14
Merge branch 'nd/status-show-in-progress'
blob
|
diff
|
raw
2013-02-14
Merge branch 'bw/get-tz-offset-perl'
blob
|
diff
|
raw
2013-02-14
Merge branch 'al/mergetool-printf-fix'
blob
|
diff
|
raw
2013-02-14
Merge branch 'jk/error-const-return'
blob
|
diff
|
raw
2013-02-14
Merge branch 'jx/utf8-printf-width'
blob
|
diff
|
raw
2013-02-14
Merge branch 'mg/bisect-doc'
blob
|
diff
|
raw
2013-02-14
Merge branch 'tz/perl-styles'
blob
|
diff
|
raw
2013-02-14
Merge branch 'jc/extended-fake-ancestor-for-gitlink'
blob
|
diff
|
raw
2013-02-14
Merge branch 'dg/subtree-fixes'
blob
|
diff
|
raw
2013-02-12
Merge branch 'maint'
blob
|
diff
|
raw
2013-02-11
Merge branch 'maint'
blob
|
diff
|
raw
2013-02-11
Merge branch 'sp/smart-http-content-type-check'
blob
|
diff
|
raw
2013-02-09
Merge branch 'master' of git://github.com/git-l10n...
blob
|
diff
|
raw
2013-02-08
Merge branch 'jc/combine-diff-many-parents'
blob
|
diff
|
raw
2013-02-08
Merge branch 'jk/apply-similaritly-parsing'
blob
|
diff
|
raw
2013-02-08
Merge branch 'mk/tcsh-complete-only-known-paths'
blob
|
diff
|
raw
2013-02-08
Merge branch 'mp/complete-paths'
blob
|
diff
|
raw
2013-02-08
Merge branch 'ct/autoconf-htmldir'
blob
|
diff
|
raw
2013-02-07
Sync with 1.8.1.3
blob
|
diff
|
raw
2013-02-07
Merge branch 'ft/transport-report-segv' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-07
Merge branch 'sb/gpg-plug-fd-leak' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-07
Merge branch 'jn/auto-depend-workaround-buggy-ccache...
blob
|
diff
|
raw
|
diff to current
2013-02-07
Merge branch 'da/mergetool-docs'
blob
|
diff
|
raw
2013-02-07
Merge branch 'ss/mergetools-tortoise'
blob
|
diff
|
raw
|
diff to current
2013-02-07
Merge branch 'jk/mergetool'
blob
|
diff
|
raw
|
diff to current
2013-02-07
Merge branch 'sb/run-command-fd-error-reporting'
blob
|
diff
|
raw
|
diff to current
2013-02-06
Merge branch 'jn/auto-depend-workaround-buggy-ccache'
blob
|
diff
|
raw
|
diff to current
2013-02-06
Merge branch 'sb/gpg-plug-fd-leak'
blob
|
diff
|
raw
|
diff to current
2013-02-06
Merge branch 'ft/transport-report-segv'
blob
|
diff
|
raw
|
diff to current
2013-02-04
Merge branch 'nd/edit-branch-desc-while-detached' into...
blob
|
diff
|
raw
|
diff to current
2013-02-04
Merge branch 'jn/do-not-drop-username-when-reading...
blob
|
diff
|
raw
|
diff to current
2013-02-04
Merge branch 'dl/am-hg-locale' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-03
doc: generate a list of valid merge tools
blob
|
diff
|
raw
2013-02-03
mergetool--lib: list user configured tools in '--tool...
blob
|
diff
|
raw
|
diff to current
2013-02-03
mergetool--lib: add functions for finding available...
blob
|
diff
|
raw
|
diff to current
2013-02-01
Merge branch 'nd/edit-branch-desc-while-detached'
blob
|
diff
|
raw
|
diff to current
2013-02-01
Merge branch 'jn/do-not-drop-username-when-reading...
blob
|
diff
|
raw
|
diff to current
2013-02-01
Merge branch 'jc/no-git-config-in-clone'
blob
|
diff
|
raw
|
diff to current
2013-01-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-30
Merge branch 'nd/edit-branch-desc-while-detached' into...
blob
|
diff
|
raw
|
diff to current
2013-01-30
Merge branch 'tb/t0050-maint' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-29
mergetool--lib: improve the help text in guess_merge_tool()
blob
|
diff
|
raw
|
diff to current
2013-01-29
mergetool--lib: simplify command expressions
blob
|
diff
|
raw
|
diff to current
2013-01-29
Merge branch 'ph/rebase-preserve-all-merges' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-29
mergetools: simplify how we handle "vim" and "defaults"
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'ss/help-htmlpath-config-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'nd/attr-debug-fix' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'ds/completion-silence-in-tree-path-probe...
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'jn/maint-trim-vim-contrib' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'pe/doc-email-env-is-trumped-by-config...
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'ap/status-ignored-in-ignored-directory...
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'mh/ceiling' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'tb/t0050-maint'
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'dl/am-hg-locale'
blob
|
diff
|
raw
|
diff to current
2013-01-28
mergetool--lib: don't call "exit" in setup_tool
blob
|
diff
|
raw
|
diff to current
2013-01-28
mergetool--lib: improve show_tool_help() output
blob
|
diff
|
raw
|
diff to current
2013-01-27
Merge branch 'jk/maint-gc-auto-after-fetch' into jk...
blob
|
diff
|
raw
|
diff to current
2013-01-25
Merge branch 'nd/retire-fnmatch'
blob
|
diff
|
raw
|
diff to current
2013-01-25
git-mergetool: don't hardcode 'mergetool' in show_tool_help
blob
|
diff
|
raw
|
diff to current
2013-01-25
git-mergetool: remove redundant assignment
blob
|
diff
|
raw
|
diff to current
2013-01-25
git-mergetool: move show_tool_help to mergetool--lib
blob
|
diff
|
raw
|
diff to current
2013-01-24
Merge branch 'ch/add-auto-submitted-in-sample-post...
blob
|
diff
|
raw
|
diff to current
2013-01-24
Merge branch 'as/check-ignore'
blob
|
diff
|
raw
|
diff to current
2013-01-24
Merge branch 'rs/clarify-entry-cmp-sslice'
blob
|
diff
|
raw
|
diff to current
2013-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-22
Merge branch 'ph/rebase-preserve-all-merges'
blob
|
diff
|
raw
|
diff to current
2013-01-22
Merge branch 'nd/clone-no-separate-git-dir-with-bare'
blob
|
diff
|
raw
|
diff to current
2013-01-21
Merge branch 'nz/send-email-headers-are-case-insensitiv...
blob
|
diff
|
raw
|
diff to current
2013-01-21
Merge branch 'rs/zip-with-uncompressed-size-in-the...
blob
|
diff
|
raw
|
diff to current
2013-01-18
Merge branch 'ss/help-htmlpath-config-doc'
blob
|
diff
|
raw
|
diff to current
2013-01-18
Merge branch 'nd/attr-debug-fix'
blob
|
diff
|
raw
|
diff to current
2013-01-18
Merge branch 'ds/completion-silence-in-tree-path-probe'
blob
|
diff
|
raw
|
diff to current
2013-01-18
Merge branch 'jn/maint-trim-vim-contrib'
blob
|
diff
|
raw
|
diff to current
2013-01-18
Merge branch 'pe/doc-email-env-is-trumped-by-config'
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jc/blame-no-follow'
blob
|
diff
|
raw
|
diff to current
next