Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cm/diff-check-at-eol' | Junio C Hamano | 2010-11-29 | 1 | -0/+9 |
|\ | |||||
| * | diff --check: correct line numbers of new blank lines at EOF | Christoph Mallon | 2010-10-16 | 1 | -0/+9 |
* | | Merge branch 'ak/apply-non-git-epoch' | Junio C Hamano | 2010-11-29 | 4 | -0/+28 |
|\ \ | |||||
| * | | apply: handle patches with funny filename and colon in timezone | Jonathan Nieder | 2010-11-10 | 3 | -0/+26 |
| * | | apply: Recognize epoch timestamps with : in the timezone | Anders Kaseorg | 2010-10-13 | 1 | -0/+2 |
* | | | Merge branch 'tc/smart-http-post-redirect' | Junio C Hamano | 2010-11-29 | 2 | -0/+15 |
|\ \ \ | |||||
| * | | | smart-http: Don't change POST to GET when following redirect | Tay Ray Chuan | 2010-09-27 | 2 | -0/+15 |
* | | | | Merge branch 'en/and-cascade-tests' | Junio C Hamano | 2010-11-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t7300: add a missing SYMLINKS prerequisite | Johannes Sixt | 2010-11-26 | 1 | -1/+1 |
* | | | | | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 2010-11-24 | 1 | -0/+16 |
|\ \ \ \ \ | |||||
| * | | | | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -0/+16 |
* | | | | | | Merge branch 'ao/send-email-irt' | Junio C Hamano | 2010-11-24 | 1 | -0/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-send-email.perl: make initial In-Reply-To apply only to first email | Antonio Ospite | 2010-11-12 | 1 | -1/+3 |
| * | | | | | | t9001: send-email interation with --in-reply-to and --chain-reply-to | Junio C Hamano | 2010-11-05 | 1 | -0/+41 |
* | | | | | | | Merge branch 'kb/maint-rebase-autosquash' | Junio C Hamano | 2010-11-24 | 1 | -0/+74 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase: teach --autosquash to match on sha1 in addition to message | Kevin Ballard | 2010-11-09 | 1 | -0/+31 |
| * | | | | | | | rebase: better rearranging of fixup!/squash! lines with --autosquash | Kevin Ballard | 2010-11-09 | 1 | -0/+43 |
* | | | | | | | | Merge branch 'mm/phrase-remote-tracking' | Junio C Hamano | 2010-11-24 | 7 | -26/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change incorrect "remote branch" to "remote tracking branch" in C code | Matthieu Moy | 2010-11-03 | 4 | -7/+9 |
| * | | | | | | | | Change remote tracking to remote-tracking in non-trivial places | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
| * | | | | | | | | Replace "remote tracking" with "remote-tracking" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
| * | | | | | | | | Better "Changed but not updated" message in git-status | Matthieu Moy | 2010-11-03 | 1 | -17/+17 |
* | | | | | | | | | Merge branch 'en/and-cascade-tests' | Junio C Hamano | 2010-11-24 | 114 | -657/+597 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | t4124 (apply --whitespace): use test_might_fail | Jonathan Nieder | 2010-11-09 | 1 | -3/+2 |
| * | | | | | | | | t3404: do not use 'describe' to implement test_cmp_rev | Junio C Hamano | 2010-11-09 | 1 | -2/+2 |
| * | | | | | | | | t3404 (rebase -i): introduce helper to check position of HEAD | Jonathan Nieder | 2010-11-09 | 1 | -15/+9 |
| * | | | | | | | | t3404 (rebase -i): move comment to description | Jonathan Nieder | 2010-11-09 | 1 | -18/+17 |
| * | | | | | | | | t3404 (rebase -i): unroll test_commit loops | Jonathan Nieder | 2010-11-09 | 1 | -12/+11 |
| * | | | | | | | | t3301 (notes): use test_expect_code for clarity | Jonathan Nieder | 2010-11-09 | 1 | -1/+1 |
| * | | | | | | | | t1400 (update-ref): use test_must_fail | Jonathan Nieder | 2010-11-09 | 1 | -3/+2 |
| * | | | | | | | | t1502 (rev-parse --parseopt): test exit code from "-h" | Jonathan Nieder | 2010-11-09 | 1 | -1/+1 |
| * | | | | | | | | t6022 (renaming merge): chain test commands with && | Jonathan Nieder | 2010-11-09 | 1 | -190/+92 |
| * | | | | | | | | test-lib: introduce test_line_count to measure files | Jonathan Nieder | 2010-11-09 | 2 | -0/+26 |
| * | | | | | | | | tests: add missing &&, batch 2 | Jonathan Nieder | 2010-11-09 | 13 | -48/+48 |
| * | | | | | | | | tests: add missing && | Jonathan Nieder | 2010-11-09 | 84 | -166/+166 |
| * | | | | | | | | Introduce sane_unset and use it to ensure proper && chaining | Elijah Newren | 2010-10-06 | 5 | -29/+37 |
| * | | | | | | | | t7800 (difftool): add missing && | Elijah Newren | 2010-10-06 | 1 | -6/+6 |
| * | | | | | | | | t7601 (merge-pull-config): add missing && | Elijah Newren | 2010-10-06 | 1 | -6/+6 |
| * | | | | | | | | t7001 (mv): add missing && | Elijah Newren | 2010-10-06 | 1 | -1/+1 |
| * | | | | | | | | t6016 (rev-list-graph-simplify-history): add missing && | Elijah Newren | 2010-10-06 | 1 | -19/+10 |
| * | | | | | | | | t5602 (clone-remote-exec): add missing && | Elijah Newren | 2010-10-06 | 1 | -7/+15 |
| * | | | | | | | | t4026 (color): remove unneeded and unchained command | Elijah Newren | 2010-10-06 | 1 | -1/+0 |
| * | | | | | | | | t4019 (diff-wserror): add lots of missing && | Elijah Newren | 2010-10-06 | 1 | -26/+27 |
| * | | | | | | | | t4202 (log): Replace '<git-command> || :' with test_might_fail | Elijah Newren | 2010-10-06 | 1 | -1/+1 |
| * | | | | | | | | t4002 (diff-basic): use test_might_fail for commands that might fail | Elijah Newren | 2010-10-06 | 1 | -6/+6 |
| * | | | | | | | | t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && | Elijah Newren | 2010-10-06 | 2 | -14/+14 |
| * | | | | | | | | t4017 (diff-retval): replace manual exit code check with test_expect_code | Elijah Newren | 2010-10-06 | 1 | -49/+20 |
| * | | | | | | | | test-lib: make test_expect_code a test command | Ævar Arnfjörð Bjarmason | 2010-10-06 | 5 | -38/+82 |
* | | | | | | | | | Merge branch 'kb/maint-submodule-savearg' | Junio C Hamano | 2010-11-17 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule: only preserve flags across recursive status/update invocations | Kevin Ballard | 2010-11-03 | 1 | -0/+34 |