summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Move create_notes_commit() from notes-merge.c into notes-utils.cJohan Herland2013-06-124-41/+41
| * | | | | | | | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-126-146/+159
| * | | | | | | | | | finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland2013-06-123-6/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fc/sequencer-plug-leak'Junio C Hamano2013-06-241-7/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sequencer: avoid leaking message buffer when refusing to create an empty commitFelipe Contreras2013-06-061-2/+4
| * | | | | | | | | | sequencer: remove useless indentationFelipe Contreras2013-06-031-7/+9
| |/ / / / / / / / /
* | | | | | | | | | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-243-76/+0
* | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-06-231-0/+4
* | | | | | | | | | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-238-203/+673
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase topology tests: fix commit names on case-insensitive file systemsJohannes Sixt2013-06-182-18/+18
| * | | | | | | | | | tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk2013-06-072-22/+22
| * | | | | | | | | | t3406: modernize styleMartin von Zweigbergk2013-06-071-21/+9
| * | | | | | | | | | add tests for rebasing merged historyMartin von Zweigbergk2013-06-075-137/+260
| * | | | | | | | | | add tests for rebasing rootMartin von Zweigbergk2013-06-071-0/+129
| * | | | | | | | | | add tests for rebasing of empty commitsMartin von Zweigbergk2013-06-072-24/+58
| * | | | | | | | | | add tests for rebasing with patch-equivalence presentMartin von Zweigbergk2013-06-072-0/+102
| * | | | | | | | | | add simple tests of consistency across rebase typesMartin von Zweigbergk2013-06-072-0/+94
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/unpack-entry-fallback-to-another'Junio C Hamano2013-06-232-2/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack_entry: do not die when we fail to apply a deltaJeff King2013-06-142-1/+37
| * | | | | | | | | | t5303: drop "count=1" from corruption ddJeff King2013-06-141-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/apache-test-for-2.4'Junio C Hamano2013-06-231-1/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lib-httpd/apache.conf: check version only after mod_version loadsJeff King2013-06-211-3/+4
| * | | | | | | | | | t/lib-httpd/apache.conf: configure an MPM module for apache 2.4Jeff King2013-06-141-0/+3
| * | | | | | | | | | t/lib-httpd/apache.conf: load compat access module in apache 2.4Jeff King2013-06-141-0/+3
| * | | | | | | | | | t/lib-httpd/apache.conf: load extra auth modules in apache 2.4Jeff King2013-06-141-0/+9
| * | | | | | | | | | t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4Jeff King2013-06-141-0/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cm/remote-mediawiki-perlcritique'Junio C Hamano2013-06-233-247/+320
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-remote-mediawiki: make error message more preciseCélestin Matte2013-06-141-3/+7
| * | | | | | | | | | git-remote-mediawiki: add a perlcritic rule in MakefileCélestin Matte2013-06-141-0/+2
| * | | | | | | | | | git-remote-mediawiki: add a .perlcriticrc fileCélestin Matte2013-06-141-0/+28
| * | | | | | | | | | git-remote-mediawiki: clearly rewrite double dereferenceCélestin Matte2013-06-141-4/+4
| * | | | | | | | | | git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")Célestin Matte2013-06-141-2/+2
| * | | | | | | | | | git-remote-mediawiki: put non-trivial numeric values in constants.Célestin Matte2013-06-141-6/+14
| * | | | | | | | | | git-remote-mediawiki: don't use quotes for empty stringsCélestin Matte2013-06-141-8/+10
| * | | | | | | | | | git-remote-mediawiki: replace "unless" statements with negated "if" statementsCélestin Matte2013-06-141-6/+6
| * | | | | | | | | | git-remote-mediawiki: brace file handles for print for more clarityCélestin Matte2013-06-141-95/+95
| * | | | | | | | | | git-remote-mediawiki: modify strings for a better coding-styleCélestin Matte2013-06-141-120/+119
| * | | | | | | | | | git-remote-mediawiki: put long code into a subroutineCélestin Matte2013-06-141-24/+32
| * | | | | | | | | | git-remote-mediawiki: remove import of unused open2Célestin Matte2013-06-141-1/+0
| * | | | | | | | | | git-remote-mediawiki: check return value of openCélestin Matte2013-06-141-1/+2
| * | | | | | | | | | git-remote-mediawiki: assign a variable as undef and make proper indentationCélestin Matte2013-06-141-1/+4
| * | | | | | | | | | git-remote-mediawiki: rename a variable ($last) which has the name of a keywordCélestin Matte2013-06-141-4/+4
| * | | | | | | | | | git-remote-mediawiki: remove unused variable $entryCélestin Matte2013-06-141-1/+0
| * | | | | | | | | | git-remote-mediawiki: turn double-negated expressions into simple expressionsCélestin Matte2013-06-141-4/+4
| * | | | | | | | | | git-remote-mediawiki: change the name of a variableCélestin Matte2013-06-141-3/+3
| * | | | | | | | | | git-remote-mediawiki: add newline in the end of die() error messagesCélestin Matte2013-06-141-13/+13
| * | | | | | | | | | git-remote-mediawiki: change style in a regexpCélestin Matte2013-06-141-1/+1
| * | | | | | | | | | git-remote-mediawiki: change style in a regexpCélestin Matte2013-06-141-1/+1
| * | | | | | | | | | git-remote-mediawiki: change separator of some regexpsCélestin Matte2013-06-141-3/+3
| * | | | | | | | | | git-remote-mediawiki: change the behaviour of a splitCélestin Matte2013-06-141-1/+1