summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/error-const-return'Junio C Hamano2013-01-056-9/+29
|\
| * silence some -Wuninitialized false positivesJeff King2012-12-154-9/+17
| * make error()'s constant return value more visibleJeff King2012-12-152-0/+12
* | Merge branch 'jc/format-color-auto'Junio C Hamano2013-01-055-8/+76
|\ \
| * | log --format: teach %C(auto,black) to respect color configJunio C Hamano2012-12-175-4/+72
| * | t6006: clean up whitespaceJunio C Hamano2012-12-171-4/+4
* | | Merge branch 'jk/complete-commit-c'Junio C Hamano2013-01-051-0/+7
|\ \ \
| * | | completion: complete refs for "git commit -c"Jeff King2012-12-151-0/+7
* | | | Merge branch 'ja/directory-attrs'Junio C Hamano2013-01-053-9/+76
|\ \ \ \
| * | | | Add directory pattern matching to attributesJean-Noël AVILA2012-12-173-9/+76
* | | | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-057-38/+214
|\ \ \ \ \
| * | | | | mailmap: default mailmap.blob in bare repositoriesJeff King2012-12-133-3/+35
| * | | | | mailmap: fix some documentation loose-ends for mailmap.blobJeff King2012-12-132-2/+3
| * | | | | mailmap: clean up read_mailmap error handlingJeff King2012-12-121-11/+21
| * | | | | mailmap: support reading mailmap from blobsJeff King2012-12-125-2/+129
| * | | | | mailmap: refactor mailmap parsing for non-file sourcesJeff King2012-12-121-34/+40
* | | | | | Merge branch 'jc/fetch-ignore-symref'Junio C Hamano2013-01-052-1/+54
|\ \ \ \ \ \
| * | | | | | fetch: ignore wildcarded refspecs that update local symbolic refsJunio C Hamano2012-12-112-1/+54
* | | | | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-0513-60/+188
|\ \ \ \ \ \ \
| * | | | | | | push: allow already-exists advice to be disabledChris Rorvick2012-12-034-2/+11
| * | | | | | | push: rename config variable for more general useChris Rorvick2012-12-034-7/+10
| * | | | | | | push: cleanup push rules commentChris Rorvick2012-12-031-15/+17
| * | | | | | | push: clarify rejection of update to non-commit-ishChris Rorvick2012-12-021-0/+5
| * | | | | | | push: require force for annotated tagsChris Rorvick2012-12-023-7/+35
| * | | | | | | push: require force for refs under refs/tags/Chris Rorvick2012-12-029-13/+62
| * | | | | | | push: flag updates that require forceChris Rorvick2012-12-023-5/+12
| * | | | | | | push: keep track of "update" state separatelyChris Rorvick2012-12-022-7/+12
| * | | | | | | push: add advice for rejected tag referenceChris Rorvick2012-12-025-0/+25
| * | | | | | | push: return reject reasons as a bitsetChris Rorvick2012-12-024-24/+19
* | | | | | | | Merge branch 'fc/fast-export-fixes'Junio C Hamano2013-01-0510-23/+352
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-export: make sure updated refs get updatedFelipe Contreras2012-12-033-15/+30
| * | | | | | | | fast-export: don't handle uninteresting refsFelipe Contreras2012-12-033-4/+45
| * | | | | | | | fast-export: fix comparison in testsFelipe Contreras2012-11-291-3/+3
| * | | | | | | | fast-export: trivial cleanupFelipe Contreras2012-11-291-1/+1
| * | | | | | | | remote-testgit: implement the "done" feature manuallyFelipe Contreras2012-11-291-1/+3
| * | | | | | | | remote-testgit: report success after an importFelipe Contreras2012-11-291-0/+13
| * | | | | | | | remote-testgit: exercise more featuresFelipe Contreras2012-11-292-12/+78
| * | | | | | | | remote-testgit: cleanup testsFelipe Contreras2012-11-291-34/+29
| * | | | | | | | remote-testgit: remove irrelevant testFelipe Contreras2012-11-291-13/+0
| * | | | | | | | remote-testgit: remove non-local functionalityFelipe Contreras2012-11-292-32/+21
| * | | | | | | | Add new simplified git-remote-testgitFelipe Contreras2012-11-293-1/+204
| * | | | | | | | Rename git-remote-testgit to git-remote-testpyFelipe Contreras2012-11-294-9/+9
| * | | | | | | | remote-helpers: fix failure messageFelipe Contreras2012-11-261-2/+2
| * | | | | | | | remote-testgit: fix direction of marksFelipe Contreras2012-11-262-2/+2
| * | | | | | | | fast-export: avoid importing blob marksFelipe Contreras2012-11-262-0/+18
* | | | | | | | | Merge branch 'mh/unify-xml-in-imap-send-and-http-push'Junio C Hamano2013-01-054-108/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wrap_in_html(): process message in bulk rather than line-by-lineMichael Haggerty2012-12-021-20/+13
| * | | | | | | | | wrap_in_html(): use strbuf_addstr_xml_quoted()Michael Haggerty2012-11-291-19/+4
| * | | | | | | | | imap-send: change msg_data from storing (ptr, len) to storing strbufMichael Haggerty2012-11-291-45/+47
| * | | | | | | | | imap-send: correctly report errors reading from stdinMichael Haggerty2012-11-261-2/+7