Merge branch 'cc/access-on-aix-workaround'

Junio C Hamano committed over 7 years ago

Merge branch 'pw/clean-sequencer-state-upon-final-commit'

Junio C Hamano committed over 7 years ago

Merge branch 'pw/rebase-i-internal'

Junio C Hamano committed over 7 years ago

Merge branch 'jk/perf-aggregate-wo-libjson'

Junio C Hamano committed over 7 years ago

Merge branch 'dl/rev-tilde-doc-clarify'

Junio C Hamano committed over 7 years ago

Merge branch 'jc/make-dedup-ls-files-output'

Junio C Hamano committed over 7 years ago

Merge branch 'jk/ls-files-doc-markup-fix'

Junio C Hamano committed over 7 years ago

Merge branch 'jk/p5302-avoid-collision-check-cost'

Junio C Hamano committed over 7 years ago

Merge branch 'dl/no-extern-in-func-decl'

Junio C Hamano committed over 7 years ago

Merge branch 'ew/repack-with-bitmaps-by-default'

Junio C Hamano committed over 7 years ago

Merge branch 'js/partial-clone-connectivity-check'

Junio C Hamano committed over 7 years ago

Merge branch 'jh/trace2-sid-fix'

Junio C Hamano committed over 7 years ago

difftool: fallback on merge.guitool

Denton Liu committed over 7 years ago

difftool: make --gui, --tool and --extcmd mutually exclusive

Denton Liu committed over 7 years ago

mergetool: fallback to tool when guitool unavailable

Denton Liu committed over 7 years ago

mergetool--lib: create gui_mode function

Denton Liu committed over 7 years ago

mergetool: use get_merge_tool function

Denton Liu committed over 7 years ago

trace2: add variable description to git.txt

Derrick Stolee committed over 7 years ago

send-email: do defaults -> config -> getopt in that order

Ævar Arnfjörð Bjarmason committed over 7 years ago

send-email: rename the @bcclist variable for consistency

Ævar Arnfjörð Bjarmason committed over 7 years ago