Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ak/profile-feedback-build' | Junio C Hamano | 2014-07-21 | 3 | -8/+34 |
|\ | |||||
| * | Fix profile feedback with -jN and add profile-fastak/profile-feedback-build | Andi Kleen | 2014-07-08 | 2 | -6/+29 |
| * | Run the perf test suite for profile feedback too | Andi Kleen | 2014-07-08 | 1 | -0/+1 |
| * | Don't define away __attribute__ on gcc | Andi Kleen | 2014-07-07 | 1 | -0/+2 |
| * | Use BASIC_FLAGS for profile feedback | Andi Kleen | 2014-07-07 | 1 | -2/+2 |
* | | Merge branch 'cc/for-each-mergetag' | Junio C Hamano | 2014-07-21 | 3 | -11/+22 |
|\ \ | |||||
| * | | commit: add for_each_mergetag()cc/for-each-mergetag | Christian Couder | 2014-07-07 | 3 | -11/+22 |
| |/ | |||||
* | | Fix contrib/subtree Makefile to patch #! line | Charles Bailey | 2014-07-21 | 1 | -1/+7 |
* | | .mailmap: map different names with the same email address together | Stefan Beller | 2014-07-17 | 1 | -0/+3 |
* | | Sync with 2.0.2 | Junio C Hamano | 2014-07-16 | 3 | -8/+26 |
|\ \ | |||||
| * | | Git 2.0.2v2.0.2 | Junio C Hamano | 2014-07-16 | 3 | -2/+22 |
| * | | Merge branch 'jc/fix-clone-single-starting-at-a-tag' into maint | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/pretty-G-format-fixes' into maint | Junio C Hamano | 2014-07-16 | 3 | -9/+70 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/fix-alt-odb-path-comparison' into maint | Junio C Hamano | 2014-07-16 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/commit-buffer-length' into maint | Junio C Hamano | 2014-07-16 | 27 | -197/+284 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'bc/fix-rebase-merge-skip' into maint | Junio C Hamano | 2014-07-16 | 2 | -2/+18 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'maint-1.9' into maint | Junio C Hamano | 2014-07-16 | 1 | -7/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 | 4 | -11/+9 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | annotate: use argv_array | René Scharfe | 2014-07-16 | 1 | -7/+5 |
* | | | | | | | | | | Eighth batch for 2.1 | Junio C Hamano | 2014-07-16 | 1 | -1/+31 |
* | | | | | | | | | | Merge branch 'ah/fix-http-push' | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | http-push.c: make CURLOPT_IOCTLDATA a usable pointerah/fix-http-push | Abbaad Haider | 2014-07-13 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-16 | 10 | -36/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fsck: simplify fsck_commit_buffer() by using commit_list_count() | René Scharfe | 2014-07-10 | 1 | -16/+6 |
| * | | | | | | | | | | commit: use commit_list_append() instead of duplicating its code | René Scharfe | 2014-07-10 | 1 | -6/+1 |
| * | | | | | | | | | | merge: simplify merge_trivial() by using commit_list_append() | René Scharfe | 2014-07-10 | 1 | -6/+4 |
| * | | | | | | | | | | use strbuf_addch for adding single characters | René Scharfe | 2014-07-10 | 3 | -3/+3 |
| * | | | | | | | | | | use strbuf_addbuf for adding strbufs | René Scharfe | 2014-07-10 | 4 | -5/+5 |
* | | | | | | | | | | | Merge branch 'jk/skip-prefix' | Junio C Hamano | 2014-07-16 | 1 | -9/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tag: use skip_prefix instead of magic numbersjk/skip-prefix | Jeff King | 2014-07-10 | 1 | -9/+5 |
* | | | | | | | | | | | | Merge branch 'po/error-message-style' | Junio C Hamano | 2014-07-16 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | doc: give some guidelines for error messagespo/error-message-style | Philip Oakley | 2014-07-10 | 1 | -0/+9 |
* | | | | | | | | | | | | | Merge branch 'jl/test-lint-scripts' | Junio C Hamano | 2014-07-16 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t/Makefile: always test all lint targets when running testsjl/test-lint-scripts | Jens Lehmann | 2014-07-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | t/Makefile: check helper scripts for non-portable shell commands too | Jens Lehmann | 2014-07-10 | 1 | -1/+2 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'zk/log-graph-showsig' | Junio C Hamano | 2014-07-16 | 2 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsig | Zoltan Klinger | 2014-07-09 | 2 | -0/+32 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'mg/fix-log-mergetag-color' | Junio C Hamano | 2014-07-16 | 1 | -10/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | log: correctly identify mergetag signature verification statusmg/fix-log-mergetag-color | Michael J Gruber | 2014-07-10 | 1 | -10/+11 |
* | | | | | | | | | | | | | | Merge branch 'kb/path-max-must-go' | Junio C Hamano | 2014-07-16 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | cache.h: rename cache_def_free to cache_def_clearkb/path-max-must-go | Karsten Blees | 2014-07-13 | 2 | -2/+2 |
* | | | | | | | | | | | | | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' | Junio C Hamano | 2014-07-16 | 2 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-merges | Charles Bailey | 2014-07-01 | 2 | -1/+18 |
* | | | | | | | | | | | | | | | | Merge branch 'mk/merge-incomplete-files' | Junio C Hamano | 2014-07-16 | 2 | -5/+90 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-files | Max Kirillov | 2014-06-30 | 2 | -2/+87 |
| * | | | | | | | | | | | | | | | | t6023-merge-file.sh: fix and mark as broken invalid tests | Max Kirillov | 2014-06-30 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/strip-suffix' | Junio C Hamano | 2014-07-16 | 11 | -84/+101 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | prepare_packed_git_one: refactor duplicate-pack checkjk/strip-suffix | Jeff King | 2014-06-30 | 1 | -2/+7 |
| * | | | | | | | | | | | | | | | | | verify-pack: use strbuf_strip_suffix | Jeff King | 2014-06-30 | 1 | -4/+3 |
| * | | | | | | | | | | | | | | | | | strbuf: implement strbuf_strip_suffix | Jeff King | 2014-06-30 | 1 | -0/+9 |