aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-17
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: give better advice when cherry-pick is in progressRalf Thielow2013-06-17
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nk/config-local-doc'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | config: Add description of --local optionNamhyung Kim2013-06-17
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/mergetool-lib-refactor'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping2013-06-17
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/doc-build-move-infordir-def'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/Makefile: move infodir to be with other '*dir'sJohn Keeping2013-06-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/Makefile: fix spaces around assignmentsJohn Keeping2013-06-17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-fixup'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: remove duplicate call to set_rev_nameFredrik Gustafsson2013-06-17
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dk/version-gen-gitdir'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | GIT-VERSION-GEN: support non-standard $GIT_DIR pathDennis Kaarsemaker2013-06-17
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dk/maint-t5150-dirname'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: allow sha1's as part of the pathDennis Kaarsemaker2013-06-17
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | unpack-trees: don't shift conflicts left and rightRené Scharfe2013-06-17
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sh-setup: add new peel_committish() helperRamkumar Ramachandra2013-06-14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rm: better error message on failure for multiple filesMathieu Lienard--Mayor2013-06-12
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/libify-note-handling'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland2013-06-12
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/sequencer-plug-leak'Junio C Hamano2013-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras2013-06-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: remove useless indentationFelipe Contreras2013-06-03
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-24
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase topology tests: fix commit names on case-insensitive file systemsJohannes Sixt2013-06-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk2013-06-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3406: modernize styleMartin von Zweigbergk2013-06-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for rebasing merged historyMartin von Zweigbergk2013-06-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for rebasing rootMartin von Zweigbergk2013-06-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for rebasing of empty commitsMartin von Zweigbergk2013-06-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for rebasing with patch-equivalence presentMartin von Zweigbergk2013-06-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add simple tests of consistency across rebase typesMartin von Zweigbergk2013-06-07
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/unpack-entry-fallback-to-another'Junio C Hamano2013-06-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unpack_entry: do not die when we fail to apply a deltaJeff King2013-06-14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5303: drop "count=1" from corruption ddJeff King2013-06-14
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/apache-test-for-2.4'Junio C Hamano2013-06-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lib-httpd/apache.conf: check version only after mod_version loadsJeff King2013-06-21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-httpd/apache.conf: configure an MPM module for apache 2.4Jeff King2013-06-14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/lib-httpd/apache.conf: load compat access module in apache 2.4Jeff King2013-06-14