aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cc/for-each-mergetag'Junio C Hamano2014-07-21
|\
| * commit: add for_each_mergetag()Christian Couder2014-07-07
* | Fix contrib/subtree Makefile to patch #! lineCharles Bailey2014-07-21
* | .mailmap: map different names with the same email address togetherStefan Beller2014-07-17
* | Sync with 2.0.2Junio C Hamano2014-07-16
|\ \
| * | Git 2.0.2v2.0.2Junio C Hamano2014-07-16
| * | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maintJunio C Hamano2014-07-16
| |\ \
| * \ \ Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-16
| |\ \ \
| * \ \ \ Merge branch 'rs/fix-alt-odb-path-comparison' into maintJunio C Hamano2014-07-16
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-16
| | |\ \ \ \ \ \ \
| | | * | | | | | | annotate: use argv_arrayRené Scharfe2014-07-16
* | | | | | | | | | Eighth batch for 2.1Junio C Hamano2014-07-16
* | | | | | | | | | Merge branch 'ah/fix-http-push'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http-push.c: make CURLOPT_IOCTLDATA a usable pointerAbbaad Haider2014-07-13
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: simplify fsck_commit_buffer() by using commit_list_count()René Scharfe2014-07-10
| * | | | | | | | | | commit: use commit_list_append() instead of duplicating its codeRené Scharfe2014-07-10
| * | | | | | | | | | merge: simplify merge_trivial() by using commit_list_append()René Scharfe2014-07-10
| * | | | | | | | | | use strbuf_addch for adding single charactersRené Scharfe2014-07-10
| * | | | | | | | | | use strbuf_addbuf for adding strbufsRené Scharfe2014-07-10
* | | | | | | | | | | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tag: use skip_prefix instead of magic numbersJeff King2014-07-10
* | | | | | | | | | | | Merge branch 'po/error-message-style'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: give some guidelines for error messagesPhilip Oakley2014-07-10
* | | | | | | | | | | | | Merge branch 'jl/test-lint-scripts'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t/Makefile: always test all lint targets when running testsJens Lehmann2014-07-10
| * | | | | | | | | | | | | t/Makefile: check helper scripts for non-portable shell commands tooJens Lehmann2014-07-10
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zk/log-graph-showsig'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | log: fix indentation for --graph --show-signatureZoltan Klinger2014-07-09
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mg/fix-log-mergetag-color'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | log: correctly identify mergetag signature verification statusMichael J Gruber2014-07-10
* | | | | | | | | | | | | | Merge branch 'kb/path-max-must-go'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cache.h: rename cache_def_free to cache_def_clearKarsten Blees2014-07-13
* | | | | | | | | | | | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | filter-branch: eliminate duplicate mapped parentsCharles Bailey2014-07-01
* | | | | | | | | | | | | | | | Merge branch 'mk/merge-incomplete-files'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov2014-06-30
| * | | | | | | | | | | | | | | | t6023-merge-file.sh: fix and mark as broken invalid testsMax Kirillov2014-06-30
* | | | | | | | | | | | | | | | | Merge branch 'jk/strip-suffix'Junio C Hamano2014-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | prepare_packed_git_one: refactor duplicate-pack checkJeff King2014-06-30
| * | | | | | | | | | | | | | | | | verify-pack: use strbuf_strip_suffixJeff King2014-06-30
| * | | | | | | | | | | | | | | | | strbuf: implement strbuf_strip_suffixJeff King2014-06-30
| * | | | | | | | | | | | | | | | | index-pack: use strip_suffix to avoid magic numbersJeff King2014-06-30
| * | | | | | | | | | | | | | | | | use strip_suffix instead of ends_with in simple casesJeff King2014-06-30
| * | | | | | | | | | | | | | | | | replace has_extension with ends_withJeff King2014-06-30
| * | | | | | | | | | | | | | | | | implement ends_with via strip_suffixJeff King2014-06-30
| * | | | | | | | | | | | | | | | | add strip_suffix functionJeff King2014-06-30