summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* status: show branchname with a configurable colorAleksi Aalto2010-11-295-8/+17
* Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-242-1/+35
|\
| * do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-152-1/+35
* | Merge branch 'ao/send-email-irt'Junio C Hamano2010-11-243-6/+65
|\ \
| * | git-send-email.perl: make initial In-Reply-To apply only to first emailAntonio Ospite2010-11-123-7/+25
| * | t9001: send-email interation with --in-reply-to and --chain-reply-toJunio C Hamano2010-11-051-0/+41
* | | Merge branch 'jk/add-e-doc'Junio C Hamano2010-11-241-3/+77
|\ \ \
| * | | docs: give more hints about how "add -e" worksJeff King2010-11-091-28/+76
| * | | docs: give more hints about how "add -e" worksJeff King2010-10-211-3/+29
* | | | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-2431-59/+66
|\ \ \ \
| * | | | verify-tag: document --verboseRené Scharfe2010-11-152-1/+5
| * | | | branch: improve --verbose descriptionRené Scharfe2010-11-151-1/+2
| * | | | archive: improve --verbose descriptionRené Scharfe2010-11-151-1/+1
| * | | | Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-1510-11/+14
| * | | | add OPT__FORCERené Scharfe2010-11-1513-15/+16
| * | | | add description parameter to OPT__QUIETRené Scharfe2010-11-1514-15/+15
| * | | | add description parameter to OPT__DRY_RUNRené Scharfe2010-11-1510-12/+10
| * | | | add description parameter to OPT__VERBOSERené Scharfe2010-11-1516-17/+17
* | | | | Merge branch 'kb/maint-rebase-autosquash'Junio C Hamano2010-11-242-7/+111
|\ \ \ \ \
| * | | | | rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard2010-11-092-7/+64
| * | | | | rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard2010-11-092-0/+47
* | | | | | 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
View Lorry Controller Status