summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t3600: test behavior of reverse-d/f conflictJeff King2013-04-041-0/+12
* rm: do not complain about d/f conflicts during deletionJeff King2013-04-043-2/+27
* git-remote-mediawiki: new wiki URL in documentationMatthieu Moy2013-04-041-1/+1
* Update draft release notes to 1.8.2.1Junio C Hamano2013-04-031-0/+35
* Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-037-25/+46
|\
| * pretty: make %GK output the signing key for signed commitsMichael J Gruber2013-02-142-1/+9
| * pretty: parse the gpg status lines rather than the outputMichael J Gruber2013-02-141-5/+9
| * gpg_interface: allow to request status returnMichael J Gruber2013-02-146-10/+13
| * log-tree: rely upon the check in the gpg_interfaceMichael J Gruber2013-02-141-14/+11
| * gpg-interface: check good signature in a reliable wayMichael J Gruber2013-02-141-2/+11
* | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-033-15/+34
|\ \
| * | Documentation/git-commit.txt: rework the --cleanup sectionBrandon Casey2013-02-191-10/+19
| * | git-commit: only append a newline to -m mesg if necessaryBrandon Casey2013-02-192-2/+4
| * | t7502: demonstrate breakage with a commit message with trailing newlinesBrandon Casey2013-02-191-3/+11
| * | t/t7502: compare entire commit message with what was expectedBrandon Casey2013-02-191-2/+2
* | | Merge branch 'jc/describe' into maintJunio C Hamano2013-04-031-21/+20
|\ \ \
| * | | describe: --match=<pattern> must limit the refs even when used with --allJunio C Hamano2013-02-281-21/+20
* | | | Merge branch 'jk/alias-in-bare' into maintJunio C Hamano2013-04-035-12/+53
|\ \ \ \
| * | | | setup: suppress implicit "." work-tree for bare reposJeff King2013-03-085-0/+41
| * | | | environment: add GIT_PREFIX to local_repo_envJeff King2013-03-083-2/+4
| * | | | cache.h: drop LOCAL_REPO_ENV_SIZEJeff King2013-03-082-10/+8
* | | | | Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano2013-04-034-25/+77
|\ \ \ \ \
| * | | | | format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov2013-03-094-25/+77
* | | | | | Merge branch 'jk/empty-archive' into maintJunio C Hamano2013-04-036-13/+109
|\ \ \ \ \ \
| * | | | | | archive: handle commits with an empty treeJeff King2013-03-103-1/+103
| * | | | | | test-lib: factor out $GIT_UNZIP setupJeff King2013-03-103-12/+6
* | | | | | | Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-032-1/+13
|\ \ \ \ \ \ \
| * | | | | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-132-1/+13
* | | | | | | | Merge branch 'lf/setup-prefix-pathspec' into maintJunio C Hamano2013-04-031-5/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | setup.c: check that the pathspec magic ends with ")"Andrew Wong2013-03-141-2/+3
| * | | | | | | | setup.c: stop prefix_pathspec() from looping past the end of stringAndrew Wong2013-03-141-3/+4
* | | | | | | | | Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-0319-164/+462
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Start preparing for 1.8.1.6Junio C Hamano2013-04-032-1/+35
| * | | | | | | | | Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano2013-04-034-62/+166
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | name-hash.c: fix endless loop with core.ignorecase=trueKarsten Blees2013-02-274-62/+166
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1Junio C Hamano2013-04-032-1/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix revision walk for commits with the same datesKacper Kornet2013-03-222-1/+14
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1Junio C Hamano2013-04-032-74/+97
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | t2003: work around path mangling issue on WindowsJohannes Sixt2013-03-201-2/+2
| | * | | | | | | | | entry: fix filter lookupJohn Keeping2013-03-142-1/+27
| | * | | | | | | | | t2003: modernize styleJohn Keeping2013-03-141-73/+70
| * | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-039-27/+145
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | pack-refs: add fully-peeled traitMichael Haggerty2013-03-183-6/+67
| | * | | | | | | | | | pack-refs: write peeled entry for non-tagsJeff King2013-03-172-8/+50
| | * | | | | | | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-173-9/+3
| | * | | | | | | | | | avoid segfaults on parse_object failureJeff King2013-03-174-5/+26
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1Junio C Hamano2013-04-032-1/+67
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1Junio C Hamano2013-04-032-1/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/perl-cat-blob' into maint-1.8.1Junio C Hamano2013-04-031-10/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status