summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.7.12Junio C Hamano2012-07-221-56/+24
* Sync with 1.7.11.3Junio C Hamano2012-07-222-1/+55
|\
| * Git 1.7.11.3v1.7.11.3Junio C Hamano2012-07-224-3/+57
| * Merge branch 'jk/push-delete-ref-error-message' into maintJunio C Hamano2012-07-221-0/+3
| |\
| * \ Merge branch 'ar/clone-honor-umask-at-top' into maintJunio C Hamano2012-07-223-3/+3
| |\ \
| * \ \ Merge branch 'cw/amend-commit-without-message' into maintJunio C Hamano2012-07-222-1/+16
| |\ \ \
| * \ \ \ Merge branch 'jk/maint-commit-amend-only-no-paths' into maintJunio C Hamano2012-07-222-1/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'tg/maint-cache-name-compare' into maintJunio C Hamano2012-07-222-4/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tr/maint-show-walk' into maintJunio C Hamano2012-07-222-0/+94
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano2012-07-224-50/+67
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mz/empty-rebase-test' into maintJunio C Hamano2012-07-221-0/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/fast-export-paths-with-spaces' into maintJunio C Hamano2012-07-222-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cw/no-detaching-an-unborn' into maintJunio C Hamano2012-07-222-0/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'vr/use-our-perl-in-tests' into maintJunio C Hamano2012-07-2226-44/+65
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge git://bogomips.org/git-svnJunio C Hamano2012-07-221-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: don't create master if another head existsMarcin Owsiany2012-07-191-5/+4
* | | | | | | | | | | | | | Merge branch 'jk/revision-walk-stop-at-max-count'Junio C Hamano2012-07-221-20/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | revision: avoid work after --max-count is reachedJeff King2012-07-131-20/+19
* | | | | | | | | | | | | | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-222-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config: fix several access(NULL) callsMatthieu Moy2012-07-162-6/+14
* | | | | | | | | | | | | | | | Merge branch 'as/t4012-style-updates'Junio C Hamano2012-07-221-50/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t4012: Use test_must_fail instead of if-elseAlexander Strasser2012-07-161-14/+2
| * | | | | | | | | | | | | | | | t4012: use 'printf' instead of 'dd' to generate a binary fileJohannes Sixt2012-07-161-1/+1
| * | | | | | | | | | | | | | | | t4012: Re-indent test snippetsAlexander Strasser2012-07-161-34/+34
| * | | | | | | | | | | | | | | | t4012: Make --shortstat test more robustAlexander Strasser2012-07-161-2/+2
| * | | | | | | | | | | | | | | | t4012: Break up pipe into serial redirectionsAlexander Strasser2012-07-161-1/+2
| * | | | | | | | | | | | | | | | t4012: Actually quote the sed scriptAlexander Strasser2012-07-161-2/+2
| * | | | | | | | | | | | | | | | t4012: Unquote git command fragment in test titleAlexander Strasser2012-07-111-1/+1
| * | | | | | | | | | | | | | | | t4012: modernize style for quotingAlexander Strasser2012-07-111-15/+20
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'pg/maint-1.7.9-am-where-is-patch'Junio C Hamano2012-07-222-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am: indicate where a failed patch is to be foundPaul Gortmaker2012-07-132-0/+8
* | | | | | | | | | | | | | | | | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'Junio C Hamano2012-07-222-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | submodules: don't stumble over symbolic links when cloning recursivelyJens Lehmann2012-07-122-2/+17
* | | | | | | | | | | | | | | | | | Merge branch 'ms/daemon-doc-typo'Junio C Hamano2012-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Documentation/git-daemon: add missing wordMichael Schubert2012-07-161-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'lk/more-helpful-status-hints'Junio C Hamano2012-07-222-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | status: color in-progress message like other header messagesJeff King2012-07-162-3/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-2215-172/+714
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | t1512: match the "other" object namesJunio C Hamano2012-07-131-3/+3
| * | | | | | | | | | | | | | | | | | | | t1512: ignore whitespaces in wc -l outputJunio C Hamano2012-07-111-1/+1
| * | | | | | | | | | | | | | | | | | | | rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-095-9/+78
| * | | | | | | | | | | | | | | | | | | | rev-parse: A and B in "rev-parse A..B" refer to committishJunio C Hamano2012-07-092-3/+3
| * | | | | | | | | | | | | | | | | | | | reset: the command takes committishJunio C Hamano2012-07-092-3/+9
| * | | | | | | | | | | | | | | | | | | | commit-tree: the command wants a tree and commitsJunio C Hamano2012-07-092-6/+6
| * | | | | | | | | | | | | | | | | | | | apply: --build-fake-ancestor expects blobsJunio C Hamano2012-07-092-2/+2
| * | | | | | | | | | | | | | | | | | | | sha1_name.c: add support for disambiguating other typesJunio C Hamano2012-07-093-5/+76
| * | | | | | | | | | | | | | | | | | | | revision.c: the "log" family, except for "show", takes committishJunio C Hamano2012-07-094-3/+15
| * | | | | | | | | | | | | | | | | | | | revision.c: allow handle_revision_arg() to take other flagsJunio C Hamano2012-07-093-8/+10
| * | | | | | | | | | | | | | | | | | | | sha1_name.c: introduce get_sha1_committish()Junio C Hamano2012-07-095-7/+25
| * | | | | | | | | | | | | | | | | | | | sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano2012-07-094-13/+18
View Lorry Controller Status