summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
| * | | | | | | | | | | | | | rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-192-3/+12
* | | | | | | | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better'Junio C Hamano2014-06-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | open_sha1_file: report "most interesting" errnojk/report-fail-to-read-objects-betterJeff King2014-05-151-1/+5
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/diff-files-assume-unchanged'Junio C Hamano2014-06-162-12/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchangedJeff King2014-05-152-12/+32
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/argv-array-for-child-process'Junio C Hamano2014-06-169-107/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | argv-array: drop "detach" codejk/argv-array-for-child-processJeff King2014-05-153-30/+0
| * | | | | | | | | | | | | | | get_importer: use run-command's internal argv_arrayJeff King2014-05-151-6/+3
| * | | | | | | | | | | | | | | get_exporter: use argv_arrayJeff King2014-05-151-16/+10
| * | | | | | | | | | | | | | | get_helper: use run-command's internal argv_arrayJeff King2014-05-151-6/+3
| * | | | | | | | | | | | | | | git_connect: use argv_arrayJeff King2014-05-151-18/+10
| * | | | | | | | | | | | | | | run_column_filter: use argv_arrayJeff King2014-05-151-30/+13
| * | | | | | | | | | | | | | | run-command: store an optional argv_arrayJeff King2014-05-153-1/+18
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sk/wincred'Junio C Hamano2014-06-161-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | wincred: avoid overwriting configured variablessk/wincredPat Thoyts2014-05-141-4/+4
| * | | | | | | | | | | | | | | wincred: add install targetPat Thoyts2014-05-141-0/+8
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/do-not-run-httpd-tests-as-root'Junio C Hamano2014-06-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t/lib-httpd: require SANITY prereqjk/do-not-run-httpd-tests-as-rootJeff King2014-05-121-0/+5
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'cc/replace-edit'Junio C Hamano2014-06-163-46/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: replace: describe new --edit optionChristian Couder2014-05-191-1/+15
| * | | | | | | | | | | | | | | replace: add --edit to usage stringChristian Couder2014-05-191-0/+1
| * | | | | | | | | | | | | | | replace: add tests for --editChristian Couder2014-05-191-0/+27
| * | | | | | | | | | | | | | | replace: die early if replace ref already existsChristian Couder2014-05-191-1/+4
| * | | | | | | | | | | | | | | replace: refactor checking ref validityChristian Couder2014-05-191-11/+20
| * | | | | | | | | | | | | | | replace: make sure --edit results in a different objectChristian Couder2014-05-191-0/+3
| * | | | | | | | | | | | | | | replace: add --edit optionJeff King2014-04-291-1/+111
| * | | | | | | | | | | | | | | replace: factor object resolution out of replace_objectJeff King2014-04-291-8/+18
| * | | | | | | | | | | | | | | replace: use OPT_CMDMODE to handle modesJeff King2014-04-291-24/+25
| * | | | | | | | | | | | | | | replace: refactor command-mode determinationJeff King2014-04-291-8/+6
* | | | | | | | | | | | | | | | Merge branch 'mt/patch-id-stable' (early part)Junio C Hamano2014-06-165-31/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | patch-id-test: test stable and unstable behaviourMichael S. Tsirkin2014-06-101-11/+91
| * | | | | | | | | | | | | | | | patch-id: make it stable against hunk reorderingMichael S. Tsirkin2014-06-102-20/+91
| * | | | | | | | | | | | | | | | test doc: test_write_lines does not split its argumentsJonathan Nieder2014-06-101-4/+3
| * | | | | | | | | | | | | | | | test: add test_write_lines helperMichael S. Tsirkin2014-06-102-0/+27
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2014-06-121-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-122-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny2014-06-121-2/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Update draft release notes to 2.1Junio C Hamano2014-06-091-2/+29
* | | | | | | | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude'Junio C Hamano2014-06-092-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-excludeJunio C Hamano2014-06-042-0/+7
* | | | | | | | | | | | | | | | | | Merge branch 'mn/sideband-no-ansi'Junio C Hamano2014-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | sideband.c: do not use ANSI control sequence on non-terminalmn/sideband-no-ansiMichael Naumov2014-06-021-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/mailinfo-header-cmp'Junio C Hamano2014-06-091-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mailinfo: use strcmp() for string comparisonrs/mailinfo-header-cmpRené Scharfe2014-06-021-3/+3
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'pb/trim-trailing-spaces'Junio C Hamano2014-06-092-15/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2014-06-022-15/+42
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle'Junio C Hamano2014-06-092-59/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t5538: move http push tests out to t5542na/no-http-test-in-the-middleNick Alcock2014-05-302-59/+100
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-06-092-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |