summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-042-0/+7
* | | | | | | | | | | | | Merge branch 'lt/request-pull'Junio C Hamano2014-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pullJohannes Sixt2014-06-021-1/+1
* | | | | | | | | | | | | | Second batch for 2.1Junio C Hamano2014-06-061-0/+87
* | | | | | | | | | | | | | Merge branch 'ss/howto-manage-trunk'Junio C Hamano2014-06-062-0/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | How to keep a project's canonical history correct.ss/howto-manage-trunkStephen P. Smith2014-05-282-0/+217
* | | | | | | | | | | | | | | Merge branch 'mc/git-p4-prepare-p4-only'Junio C Hamano2014-06-062-24/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-p4: Do not include diff in spec file when just preparing p4mc/git-p4-pre-are-p4-onlyMaxime Coste2014-05-272-24/+28
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jn/test-lint-unmoor'Junio C Hamano2014-06-061-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | test-lint: find unportable sed, echo, test, and export usage after &&jn/test-lint-unmoorJonathan Nieder2014-05-231-4/+4
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-065-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-varsJunio C Hamano2014-05-232-2/+10
| * | | | | | | | | | | | | | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-233-3/+6
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jj/command-line-adjective'Junio C Hamano2014-06-0619-47/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: use "command-line" when used as a compound adjective, and fix ...jj/command-line-somethingjj/command-line-adjectiveJason St. John2014-05-2119-47/+47