summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-2434-102/+124
|\
| * git-branch.txt: mention --set-upstream as a way to change upstream configurationMatthieu Moy2010-11-031-1/+2
| * user-manual: remote-tracking can be checked out, with detached HEADJonathan Nieder2010-11-031-2/+5
| * user-manual.txt: explain better the remote(-tracking) branch termsMatthieu Moy2010-11-031-3/+16
| * Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-0310-18/+20
| * Change incorrect uses of "remote branch" meaning "remote-tracking"Matthieu Moy2010-11-036-15/+18
| * Change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-0310-24/+24
| * everyday.txt: change "tracking branch" to "remote-tracking branch"Matthieu Moy2010-11-031-3/+3
| * Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy2010-11-033-6/+6
| * Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-0310-11/+11
| * Better "Changed but not updated" message in git-statusMatthieu Moy2010-11-033-19/+19
* | Merge branch 'en/and-cascade-tests'Junio C Hamano2010-11-24114-657/+597
|\ \
| * | t4124 (apply --whitespace): use test_might_failJonathan Nieder2010-11-091-3/+2
| * | t3404: do not use 'describe' to implement test_cmp_revJunio C Hamano2010-11-091-2/+2
| * | t3404 (rebase -i): introduce helper to check position of HEADJonathan Nieder2010-11-091-15/+9
| * | t3404 (rebase -i): move comment to descriptionJonathan Nieder2010-11-091-18/+17
| * | t3404 (rebase -i): unroll test_commit loopsJonathan Nieder2010-11-091-12/+11
| * | t3301 (notes): use test_expect_code for clarityJonathan Nieder2010-11-091-1/+1
| * | t1400 (update-ref): use test_must_failJonathan Nieder2010-11-091-3/+2
| * | t1502 (rev-parse --parseopt): test exit code from "-h"Jonathan Nieder2010-11-091-1/+1
| * | t6022 (renaming merge): chain test commands with &&Jonathan Nieder2010-11-091-190/+92
| * | test-lib: introduce test_line_count to measure filesJonathan Nieder2010-11-092-0/+26
| * | tests: add missing &&, batch 2Jonathan Nieder2010-11-0913-48/+48
| * | tests: add missing &&Jonathan Nieder2010-11-0984-166/+166
| * | Introduce sane_unset and use it to ensure proper && chainingElijah Newren2010-10-065-29/+37
| * | t7800 (difftool): add missing &&Elijah Newren2010-10-061-6/+6
| * | t7601 (merge-pull-config): add missing &&Elijah Newren2010-10-061-6/+6
| * | t7001 (mv): add missing &&Elijah Newren2010-10-061-1/+1
| * | t6016 (rev-list-graph-simplify-history): add missing &&Elijah Newren2010-10-061-19/+10
| * | t5602 (clone-remote-exec): add missing &&Elijah Newren2010-10-061-7/+15
| * | t4026 (color): remove unneeded and unchained commandElijah Newren2010-10-061-1/+0
| * | t4019 (diff-wserror): add lots of missing &&Elijah Newren2010-10-061-26/+27
| * | t4202 (log): Replace '<git-command> || :' with test_might_failElijah Newren2010-10-061-1/+1
| * | t4002 (diff-basic): use test_might_fail for commands that might failElijah Newren2010-10-061-6/+6
| * | t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&Elijah Newren2010-10-062-14/+14
| * | t4017 (diff-retval): replace manual exit code check with test_expect_codeElijah Newren2010-10-061-49/+20
| * | test-lib: make test_expect_code a test commandÆvar Arnfjörð Bjarmason2010-10-065-38/+82
* | | Merge branch 'maint'Junio C Hamano2010-11-243-3/+5
|\ \ \
| * \ \ Merge branch 'jl/maint-pull-tags-doc' into maintJunio C Hamano2010-11-241-0/+2
| |\ \ \
| * \ \ \ Merge branch 'kb/maint-diff-ws-check' into maintJunio C Hamano2010-11-244-47/+118
| |\ \ \ \
| * \ \ \ \ Merge branch 'jm/mailmap' into maintJunio C Hamano2010-11-242-16/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tr/maint-git-repack-tmpfile' into maintJunio C Hamano2010-11-241-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-242-1/+32
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ak/submodule-sync' into maintJunio C Hamano2010-11-242-3/+14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-244-6/+16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-243-25/+124
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano2010-11-242-3/+34
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/maint-blame-el' into maintJunio C Hamano2010-11-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/git-p4-deletion' into maintJunio C Hamano2010-11-241-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status