summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-06-27rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott
2013-06-24Update draft release notes to 1.8.4Junio C Hamano
2013-06-24Merge branch 'rr/am-quit-empty-then-abort-fix'Junio C Hamano
2013-06-24Merge branch 'rt/cherry-pick-continue-advice-in-status'Junio C Hamano
2013-06-24Merge branch 'nk/config-local-doc'Junio C Hamano
2013-06-24Merge branch 'jk/mergetool-lib-refactor'Junio C Hamano
2013-06-24Merge branch 'jk/doc-build-move-infordir-def'Junio C Hamano
2013-06-24Merge branch 'fg/submodule-fixup'Junio C Hamano
2013-06-24Merge branch 'dk/version-gen-gitdir'Junio C Hamano
2013-06-24Merge branch 'dk/maint-t5150-dirname'Junio C Hamano
2013-06-24Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano
2013-06-24Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano
2013-06-24Merge branch 'mm/rm-coalesce-errors'Junio C Hamano
2013-06-24Merge branch 'jh/libify-note-handling'Junio C Hamano
2013-06-24Merge branch 'fc/sequencer-plug-leak'Junio C Hamano
2013-06-24Revert "Merge branch 'jg/status-config'"Junio C Hamano
2013-06-23Update draft release notes to 1.8.4Junio C Hamano
2013-06-23Merge branch 'mz/rebase-tests'Junio C Hamano
2013-06-23Merge branch 'jk/unpack-entry-fallback-to-another'Junio C Hamano
2013-06-23Merge branch 'jk/apache-test-for-2.4'Junio C Hamano
2013-06-23Merge branch 'cm/remote-mediawiki-perlcritique'Junio C Hamano
2013-06-23Merge branch 'bp/remote-mw-tests'Junio C Hamano
2013-06-23Merge branch 'rr/rebase-autostash'Junio C Hamano
2013-06-23Merge branch 'rr/prompt-rebase-breakage-fix'Junio C Hamano
2013-06-23Merge branch 'jg/status-config'Junio C Hamano
2013-06-21lib-httpd/apache.conf: check version only after mod_version loadsJeff King
2013-06-21Sync with maintJunio C Hamano
2013-06-21transport-helper: be quiet on read errors from helpersJeff King
2013-06-21completion: complete diff --word-diffRamkumar Ramachandra
2013-06-20Update draft release notes to 1.8.4Junio C Hamano
2013-06-20Merge branch 'cm/remote-mediawiki'Junio C Hamano
2013-06-20Merge branch 'rs/match-trees-refactor'Junio C Hamano
2013-06-20Merge branch 'rs/logical-vs-binary-or'Junio C Hamano
2013-06-20Merge branch 'mm/color-auto-default'Junio C Hamano
2013-06-20Merge branch 'rs/discard-index-discard-array'Junio C Hamano
2013-06-20Merge branch 'nd/traces'Junio C Hamano
2013-06-20Merge branch 'fc/show-non-empty-errors-in-test'Junio C Hamano
2013-06-20Merge branch 'fc/makefile'Junio C Hamano
2013-06-20Merge branch 'js/test-ln-s-add'Junio C Hamano
2013-06-20Merge branch 'nd/make-wildmatch-default'Junio C Hamano
2013-06-18rebase topology tests: fix commit names on case-insensitive file systemsJohannes Sixt
2013-06-17config: Add description of --local optionNamhyung Kim
2013-06-17git-submodule.sh: remove duplicate call to set_rev_nameFredrik Gustafsson
2013-06-17wt-status: give better advice when cherry-pick is in progressRalf Thielow
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping
2013-06-17Documentation/Makefile: move infodir to be with other '*dir'sJohn Keeping
2013-06-17Documentation/Makefile: fix spaces around assignmentsJohn Keeping
2013-06-17GIT-VERSION-GEN: support non-standard $GIT_DIR pathDennis Kaarsemaker
2013-06-17tests: allow sha1's as part of the pathDennis Kaarsemaker
2013-06-17unpack-trees: don't shift conflicts left and rightRené Scharfe