aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'kb/maint-rebase-autosquash'Junio C Hamano2010-11-24
|\
| * rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard2010-11-09
| * rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard2010-11-09
* | Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-24
|\ \
| * | git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy2010-11-03
| * | user-manual: remote-tracking can be checked out, with detached HEADJonathan Nieder2010-11-03
| * | user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy2010-11-03
| * | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-03
| * | Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy2010-11-03
| * | Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-03
| * | everyday.txt: change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-03
| * | Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy2010-11-03
| * | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-03
| * | Better "Changed but not updated" message in git-statusMatthieu Moy2010-11-03
* | | Merge branch 'en/and-cascade-tests'Junio C Hamano2010-11-24
|\ \ \
| * | | t4124 (apply --whitespace): use test_might_failJonathan Nieder2010-11-09
| * | | t3404: do not use 'describe' to implement test_cmp_revJunio C Hamano2010-11-09
| * | | t3404 (rebase -i): introduce helper to check position of HEADJonathan Nieder2010-11-09
| * | | t3404 (rebase -i): move comment to descriptionJonathan Nieder2010-11-09
| * | | t3404 (rebase -i): unroll test_commit loopsJonathan Nieder2010-11-09
| * | | t3301 (notes): use test_expect_code for clarityJonathan Nieder2010-11-09
| * | | t1400 (update-ref): use test_must_failJonathan Nieder2010-11-09
| * | | t1502 (rev-parse --parseopt): test exit code from "-h"Jonathan Nieder2010-11-09
| * | | t6022 (renaming merge): chain test commands with &&Jonathan Nieder2010-11-09
| * | | test-lib: introduce test_line_count to measure filesJonathan Nieder2010-11-09
| * | | tests: add missing &&, batch 2Jonathan Nieder2010-11-09
| * | | tests: add missing &&Jonathan Nieder2010-11-09
| * | | Introduce sane_unset and use it to ensure proper && chainingElijah Newren2010-10-06
| * | | t7800 (difftool): add missing &&Elijah Newren2010-10-06
| * | | t7601 (merge-pull-config): add missing &&Elijah Newren2010-10-06
| * | | t7001 (mv): add missing &&Elijah Newren2010-10-06
| * | | t6016 (rev-list-graph-simplify-history): add missing &&Elijah Newren2010-10-06
| * | | t5602 (clone-remote-exec): add missing &&Elijah Newren2010-10-06
| * | | t4026 (color): remove unneeded and unchained commandElijah Newren2010-10-06
| * | | t4019 (diff-wserror): add lots of missing &&Elijah Newren2010-10-06
| * | | t4202 (log): Replace '<git-command> || :' with test_might_failElijah Newren2010-10-06
| * | | t4002 (diff-basic): use test_might_fail for commands that might failElijah Newren2010-10-06
| * | | t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&Elijah Newren2010-10-06
| * | | t4017 (diff-retval): replace manual exit code check with test_expect_codeElijah Newren2010-10-06
| * | | test-lib: make test_expect_code a test commandÆvar Arnfjörð Bjarmason2010-10-06
* | | | Merge branch 'maint'Junio C Hamano2010-11-24
|\ \ \ \
| * \ \ \ Merge branch 'jl/maint-pull-tags-doc' into maintJunio C Hamano2010-11-24
| |\ \ \ \
| * \ \ \ \ Merge branch 'kb/maint-diff-ws-check' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jm/mailmap' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tr/maint-git-repack-tmpfile' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ak/submodule-sync' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \ \ \ \ \ \ \