summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-304-3/+11
* pretty: treat "--format=" as an empty userformatJeff King2014-07-301-2/+2
* revision: drop useless string offset when parsing "--pretty"Jeff King2014-07-301-1/+1
* Merge branch 'maint'Junio C Hamano2014-07-281-0/+10
|\
| * t4013: test diff-tree's --stdin commit formattingJeff King2014-07-281-0/+10
| * Merge branch 'jk/alloc-commit-id-maint' into maintJunio C Hamano2014-07-2811-89/+103
| |\
| | * diff-tree: avoid lookup_unknown_objectjk/alloc-commit-id-maintJeff King2014-07-281-3/+1
| | * object_as_type: set commit indexJeff King2014-07-281-0/+2
| | * alloc: factor out commit indexJeff King2014-07-282-2/+8
| | * add object_as_type helper for casting objectsJeff King2014-07-287-43/+25
| | * parse_object_buffer: do not set object typeJeff King2014-07-281-2/+0
| | * move setting of object->type to alloc_* functionsJeff King2014-07-288-12/+13
| | * alloc: write out allocator definitionsJeff King2014-07-281-11/+27
| | * alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones2014-07-281-18/+29
| |/
* | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-287-13/+16
|\ \
| * | apply: avoid possible bogus pointerjk/misc-fixes-maintJeff King2014-07-241-1/+1
| * | fix memory leak parsing core.commentcharJeff King2014-07-241-5/+5
| * | transport: fix leaks in refs_from_alternate_cbJeff King2014-07-241-2/+3
| * | free ref string returned by dwim_refJeff King2014-07-243-1/+5
| * | receive-pack: don't copy "dir" parameterJeff King2014-07-241-2/+2
* | | t1402: check for refs ending with a dotJeff King2014-07-281-0/+1
* | | Revert "Merge branch 'dt/refs-check-refname-component-sse'"Junio C Hamano2014-07-284-250/+18
* | | Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'"Junio C Hamano2014-07-282-13/+5
* | | Git 2.1.0-rc0v2.1.0-rc0Junio C Hamano2014-07-272-1/+23
* | | Merge branch 'jk/rebase-am-fork-point'Junio C Hamano2014-07-274-8/+41
|\ \ \
| * | | rebase: omit patch-identical commits with --fork-pointjk/rebase-am-fork-pointJohn Keeping2014-07-164-6/+32
| * | | rebase--am: use --cherry-pick instead of --ignore-if-in-upstreamJohn Keeping2014-07-151-4/+11
* | | | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-276-26/+313
|\ \ \ \
| * | | | replace: add test for --graft with a mergetagcc/replace-graftChristian Couder2014-07-211-0/+22
| * | | | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | | | replace: add test for --graft with signed commitChristian Couder2014-07-211-0/+24
| * | | | replace: remove signature when using --graftChristian Couder2014-07-213-0/+41
| * | | | contrib: add convert-grafts-to-replace-refs.shChristian Couder2014-07-212-1/+31
| * | | | Documentation: replace: add --graft optionChristian Couder2014-07-211-0/+8
| * | | | replace: add test for --graftChristian Couder2014-07-211-1/+44
| * | | | replace: add --graft optionChristian Couder2014-07-211-1/+73
| * | | | replace: cleanup redirection style in testsChristian Couder2014-07-071-24/+24
* | | | | Merge branch 'jk/stable-prio-queue'Junio C Hamano2014-07-274-51/+60
|\ \ \ \ \
| * | | | | t5539: update a flaky testjk/stable-prio-queueJeff King2014-07-151-0/+1
| * | | | | paint_down_to_common: use prio_queueJeff King2014-07-151-23/+19
| * | | | | prio-queue: make output stable with respect to insertionJeff King2014-07-152-6/+17
| * | | | | prio-queue: factor out compare and swap operationsJeff King2014-07-151-24/+25
* | | | | | Sync with v2.0.3Junio C Hamano2014-07-233-2/+21
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Git 2.0.3v2.0.3Junio C Hamano2014-07-234-3/+21
| * | | | | .mailmap: combine Stefan Beller's emailsStefan Beller2014-07-231-0/+1
| * | | | | git.1: switch homepage for statsStefan Beller2014-07-231-1/+1
* | | | | | Merge branch 'rs/fix-unlink-unix-socket'Junio C Hamano2014-07-231-1/+2
|\ \ \ \ \ \
| * | | | | | unix-socket: remove stale socket before calling chdir()rs/fix-unlink-unix-socketRené Scharfe2014-07-211-1/+2
* | | | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-237-15/+19
|\ \ \ \ \ \ \
| * | | | | | | replace memset with string-list initializersta/string-list-initTanay Abhra2014-07-214-15/+6
View Lorry Controller Status