Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'fg/submodule-fixup' | Junio C Hamano | 2013-06-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-submodule.sh: remove duplicate call to set_rev_name | Fredrik Gustafsson | 2013-06-17 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'dk/version-gen-gitdir' | Junio C Hamano | 2013-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | GIT-VERSION-GEN: support non-standard $GIT_DIR path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'dk/maint-t5150-dirname' | Junio C Hamano | 2013-06-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | tests: allow sha1's as part of the path | Dennis Kaarsemaker | 2013-06-17 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs/unpack-trees-tree-walk-conflict-field' | Junio C Hamano | 2013-06-24 | 2 | -16/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | unpack-trees: don't shift conflicts left and right | René Scharfe | 2013-06-17 | 2 | -16/+4 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query' | Junio C Hamano | 2013-06-24 | 4 | -2/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | rebase: use peel_committish() where appropriate | Ramkumar Ramachandra | 2013-06-14 | 3 | -4/+4 | |
| * | | | | | | | | | | | sh-setup: add new peel_committish() helper | Ramkumar Ramachandra | 2013-06-14 | 1 | -0/+12 | |
| * | | | | | | | | | | | t/rebase: add failing tests for a peculiar revision | Ramkumar Ramachandra | 2013-06-14 | 2 | -0/+22 | |
* | | | | | | | | | | | | Merge branch 'mm/rm-coalesce-errors' | Junio C Hamano | 2013-06-24 | 5 | -19/+184 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | rm: introduce advice.rmHints to shorten messages | Mathieu Lienard--Mayor | 2013-06-12 | 5 | -1/+37 | |
| * | | | | | | | | | | | | rm: better error message on failure for multiple files | Mathieu Lienard--Mayor | 2013-06-12 | 2 | -19/+148 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jh/libify-note-handling' | Junio C Hamano | 2013-06-24 | 8 | -189/+203 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Move create_notes_commit() from notes-merge.c into notes-utils.c | Johan Herland | 2013-06-12 | 4 | -41/+41 | |
| * | | | | | | | | | | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c | Johan Herland | 2013-06-12 | 6 | -146/+159 | |
| * | | | | | | | | | | | | finish_copy_notes_for_rewrite(): Let caller provide commit message | Johan Herland | 2013-06-12 | 3 | -6/+7 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'fc/sequencer-plug-leak' | Junio C Hamano | 2013-06-24 | 1 | -7/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sequencer: avoid leaking message buffer when refusing to create an empty commit | Felipe Contreras | 2013-06-06 | 1 | -2/+4 | |
| * | | | | | | | | | | | | sequencer: remove useless indentation | Felipe Contreras | 2013-06-03 | 1 | -7/+9 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Revert "Merge branch 'jg/status-config'" | Junio C Hamano | 2013-06-24 | 3 | -76/+0 | |
* | | | | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-06-23 | 1 | -0/+4 | |
* | | | | | | | | | | | | Merge branch 'mz/rebase-tests' | Junio C Hamano | 2013-06-23 | 8 | -203/+673 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | rebase topology tests: fix commit names on case-insensitive file systems | Johannes Sixt | 2013-06-18 | 2 | -18/+18 | |
| * | | | | | | | | | | | | tests: move test for rebase messages from t3400 to t3406 | Martin von Zweigbergk | 2013-06-07 | 2 | -22/+22 | |
| * | | | | | | | | | | | | t3406: modernize style | Martin von Zweigbergk | 2013-06-07 | 1 | -21/+9 | |
| * | | | | | | | | | | | | add tests for rebasing merged history | Martin von Zweigbergk | 2013-06-07 | 5 | -137/+260 | |
| * | | | | | | | | | | | | add tests for rebasing root | Martin von Zweigbergk | 2013-06-07 | 1 | -0/+129 | |
| * | | | | | | | | | | | | add tests for rebasing of empty commits | Martin von Zweigbergk | 2013-06-07 | 2 | -24/+58 | |
| * | | | | | | | | | | | | add tests for rebasing with patch-equivalence present | Martin von Zweigbergk | 2013-06-07 | 2 | -0/+102 | |
| * | | | | | | | | | | | | add simple tests of consistency across rebase types | Martin von Zweigbergk | 2013-06-07 | 2 | -0/+94 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'jk/unpack-entry-fallback-to-another' | Junio C Hamano | 2013-06-23 | 2 | -2/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | unpack_entry: do not die when we fail to apply a delta | Jeff King | 2013-06-14 | 2 | -1/+37 | |
| * | | | | | | | | | | | | t5303: drop "count=1" from corruption dd | Jeff King | 2013-06-14 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jk/apache-test-for-2.4' | Junio C Hamano | 2013-06-23 | 1 | -1/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | lib-httpd/apache.conf: check version only after mod_version loads | Jeff King | 2013-06-21 | 1 | -3/+4 | |
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 | Jeff King | 2013-06-14 | 1 | -0/+3 | |
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: load compat access module in apache 2.4 | Jeff King | 2013-06-14 | 1 | -0/+3 | |
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 | Jeff King | 2013-06-14 | 1 | -0/+9 | |
| * | | | | | | | | | | | | t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 | Jeff King | 2013-06-14 | 1 | -0/+2 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'cm/remote-mediawiki-perlcritique' | Junio C Hamano | 2013-06-23 | 3 | -247/+320 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | git-remote-mediawiki: make error message more precise | Célestin Matte | 2013-06-14 | 1 | -3/+7 | |
| * | | | | | | | | | | | | git-remote-mediawiki: add a perlcritic rule in Makefile | Célestin Matte | 2013-06-14 | 1 | -0/+2 | |
| * | | | | | | | | | | | | git-remote-mediawiki: add a .perlcriticrc file | Célestin Matte | 2013-06-14 | 1 | -0/+28 | |
| * | | | | | | | | | | | | git-remote-mediawiki: clearly rewrite double dereference | Célestin Matte | 2013-06-14 | 1 | -4/+4 | |
| * | | | | | | | | | | | | git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki") | Célestin Matte | 2013-06-14 | 1 | -2/+2 | |
| * | | | | | | | | | | | | git-remote-mediawiki: put non-trivial numeric values in constants. | Célestin Matte | 2013-06-14 | 1 | -6/+14 | |
| * | | | | | | | | | | | | git-remote-mediawiki: don't use quotes for empty strings | Célestin Matte | 2013-06-14 | 1 | -8/+10 |