summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | sha1_name.c: many short names can only be committishJunio C Hamano2012-07-093-5/+30
| * | | | | | sha1_name.c: get_sha1_1() takes lookup flagsJunio C Hamano2012-07-091-8/+8
| * | | | | | sha1_name.c: get_describe_name() by definition groks only commitsJunio C Hamano2012-07-092-1/+257
| * | | | | | sha1_name.c: teach get_short_sha1() a commit-only optionJunio C Hamano2012-07-032-0/+10
| * | | | | | sha1_name.c: allow get_short_sha1() to take other flagsJunio C Hamano2012-07-032-3/+6
| * | | | | | get_sha1(): fix error status regressionJunio C Hamano2012-07-031-1/+1
| * | | | | | sha1_name.c: restructure disambiguation of short namesJunio C Hamano2012-07-031-60/+112
| * | | | | | sha1_name.c: correct misnamed "canonical" and "res"Junio C Hamano2012-07-031-22/+22
| * | | | | | sha1_name.c: refactor find_short_packed_object()Junio C Hamano2012-07-031-47/+56
| * | | | | | sha1_name.c: rename "now" to "current"Junio C Hamano2012-07-031-8/+8
| * | | | | | sha1_name.c: clarify what "fake" is for in find_short_object_filename()Junio C Hamano2012-07-031-0/+7
| * | | | | | sha1_name.c: get rid of get_sha1_with_mode()Junio C Hamano2012-07-033-15/+6
| * | | | | | sha1_name.c: get rid of get_sha1_with_mode_1()Junio C Hamano2012-07-033-15/+20
| * | | | | | sha1_name.c: hide get_sha1_with_context_1() uglinessJunio C Hamano2012-07-022-18/+19
| * | | | | | sha1_name.c: indentation fixJunio C Hamano2012-06-181-2/+2
* | | | | | | Merge branch 'jc/maint-filter-branch-epoch-date'Junio C Hamano2012-07-224-5/+15
|\ \ \ \ \ \ \
| * | | | | | | t7003: add test to filter a branch with a commit at epochJunio C Hamano2012-07-122-3/+13
| * | | | | | | date.c: Fix off by one error in object-header date parsingJunio C Hamano2012-07-121-1/+1
| * | | | | | | filter-branch: do not forget the '@' prefix to force git-timestampJunio C Hamano2012-07-091-1/+1
* | | | | | | | Update draft release notes for 7th batchJunio C Hamano2012-07-151-0/+34