summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/replace-graft'Junio C Hamano2014-07-286-26/+313
|\
| * replace: add test for --graft with a mergetagChristian 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-081-24/+24
* | Merge branch 'jk/stable-prio-queue'Junio C Hamano2014-07-284-51/+60
|\ \
| * | t5539: update a flaky testJeff 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()René Scharfe2014-07-211-1/+2
* | | | | Merge branch 'ta/string-list-init'Junio C Hamano2014-07-237-15/+19
|\ \ \ \ \
| * | | | | replace memset with string-list initializersTanay Abhra2014-07-214-15/+6
| * | | | | string-list: add string_list initializer helper functionTanay Abhra2014-07-213-0/+13
* | | | | | Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano2014-07-231-12/+13
|\ \ \ \ \ \
| * | | | | | use local cloning if insteadOf makes a local URLMichael Barabanov2014-07-171-12/+13
* | | | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-234-39/+115
|\ \ \ \ \ \ \
| * | | | | | | tag: support configuring --sort via .gitconfigJacob Keller2014-07-174-19/+95
| * | | | | | | tag: fix --sort tests to use cat<<-\EOF formatJacob Keller2014-07-131-20/+20
* | | | | | | | Sync with maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'ah/fix-http-push' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'po/error-message-style' into maintJunio C Hamano2014-07-221-0/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-222-0/+32
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mg/fix-log-mergetag-color' into maintJunio C Hamano2014-07-221-10/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-222-1/+18
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ye/doc-http-proto' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/api-strbuf-doc' into maintJunio C Hamano2014-07-221-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/dedup-test-config' into maintJunio C Hamano2014-07-221-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano2014-07-225-22/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/doc-wording-tweaks' into maintJunio C Hamano2014-07-222-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/instaweb-apache-24' into maintJunio C Hamano2014-07-221-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-2212-21/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/byte-order' into maintJunio C Hamano2014-07-221-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lt/request-pull' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-225-5/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-2213-103/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | remote-testsvn: use internal argv_array of struct child_process in cmd_import()René Scharfe2014-07-181-9/+7
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 14:23:56 +0100