Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing treesnd/commit-ignore-i-t-a | Nguyễn Thái Ngọc Duy | 2012-01-16 | 8 | -9/+70 |
* | cache-tree: update API to take abitrary flags | Nguyễn Thái Ngọc Duy | 2012-01-16 | 5 | -20/+19 |
* | Merge branch 'bw/maint-t8006-sed-incomplete-line' | Junio C Hamano | 2012-01-10 | 1 | -1/+1 |
|\ | |||||
| * | Use perl instead of sed for t8006-blame-textconv testbw/maint-t8006-sed-incomplete-line | Ben Walton | 2012-01-09 | 1 | -1/+1 |
* | | Sync with maint | Junio C Hamano | 2012-01-10 | 6 | -33/+91 |
|\ \ | |||||
| * | | Prepare for 1.7.8.4 | Junio C Hamano | 2012-01-10 | 2 | -1/+15 |
| * | | Merge the attributes fix in from maint-1.6.7 branch | Junio C Hamano | 2012-01-10 | 5 | -33/+77 |
| |\ \ | |||||
| | * | | Prepare for 1.7.7.6 | Junio C Hamano | 2012-01-10 | 2 | -1/+12 |
| | * | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 | 4 | -33/+66 |
| | |\ \ | |||||
| | | * | | Prepare for 1.7.6.6 | Junio C Hamano | 2012-01-10 | 2 | -1/+12 |
| | | * | | Documentation: rerere's rr-cache auto-creation and rerere.enabled | Junio C Hamano | 2012-01-10 | 1 | -1/+2 |
| | | * | | attr.c: clarify the logic to pop attr_stack | Junio C Hamano | 2012-01-10 | 1 | -1/+10 |
| | | * | | attr.c: make bootstrap_attr_stack() leave early | Junio C Hamano | 2012-01-10 | 1 | -30/+31 |
| | | * | | attr: drop misguided defensive coding | Jeff King | 2012-01-10 | 1 | -1/+1 |
| | | * | | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 | 2 | -1/+12 |
* | | | | | Merge branch 'jk/credentials' | Junio C Hamano | 2012-01-09 | 1 | -4/+3 |
|\ \ \ \ \ | |||||
| * | | | | | credentials: unable to connect to cache daemon | Clemens Buchacher | 2012-01-08 | 1 | -4/+3 |
* | | | | | | Merge branch 'mh/ref-api-less-extra-refs' | Junio C Hamano | 2012-01-09 | 1 | -29/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | write_head_info(): handle "extra refs" locallymh/ref-api-less-extra-refs | Michael Haggerty | 2012-01-06 | 1 | -4/+3 |
| * | | | | | | show_ref(): remove unused "flag" and "cb_data" arguments | Michael Haggerty | 2012-01-06 | 1 | -5/+5 |
| * | | | | | | receive-pack: move more work into write_head_info() | Michael Haggerty | 2012-01-06 | 1 | -24/+18 |
* | | | | | | | Merge branch 'mm/maint-gitweb-project-maxdepth' | Junio C Hamano | 2012-01-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gitweb: accept trailing "/" in $project_listmm/maint-gitweb-project-maxdepth | Matthieu Moy | 2012-01-04 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | send-email: multiedit is a boolean config option | Jeff King | 2012-01-09 | 1 | -1/+1 |
* | | | | | | | | Git 1.7.9-rc0v1.7.9-rc0 | Junio C Hamano | 2012-01-06 | 2 | -1/+8 |
* | | | | | | | | Merge branch 'jc/show-sig' | Junio C Hamano | 2012-01-06 | 16 | -34/+488 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log --show-signature: reword the common two-head merge casejc/show-sig | Junio C Hamano | 2012-01-05 | 1 | -0/+12 |
| * | | | | | | | | log-tree: show mergetag in log --show-signature output | Junio C Hamano | 2012-01-05 | 1 | -1/+75 |
| * | | | | | | | | log-tree.c: small refactor in show_signature() | Junio C Hamano | 2012-01-05 | 1 | -12/+16 |
| * | | | | | | | | commit --amend -S: strip existing gpgsig headers | Junio C Hamano | 2012-01-05 | 4 | -8/+36 |
| * | | | | | | | | verify_signed_buffer: fix stale comment | Junio C Hamano | 2012-01-05 | 1 | -4/+1 |
| * | | | | | | | | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' | Junio C Hamano | 2012-01-05 | 15 | -19/+364 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | gpg-interface: allow use of a custom GPG binaryjc/signed-commit | Junio C Hamano | 2011-11-29 | 3 | -6/+24 |
| | * | | | | | | | | pretty: %G[?GS] placeholders | Junio C Hamano | 2011-11-12 | 1 | -0/+86 |
| | * | | | | | | | | test "commit -S" and "log --show-signature" | Junio C Hamano | 2011-11-12 | 1 | -0/+71 |
| | * | | | | | | | | log: --show-signature | Junio C Hamano | 2011-11-12 | 5 | -0/+88 |
| | * | | | | | | | | commit: teach --gpg-sign option | Junio C Hamano | 2011-11-12 | 7 | -13/+95 |
* | | | | | | | | | | Merge branch 'jm/stash-diff-disambiguate' | Junio C Hamano | 2012-01-06 | 4 | -31/+80 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguate | Jonathon Mah | 2012-01-01 | 4 | -31/+80 |
* | | | | | | | | | | | Merge branch 'jh/fetch-head-update' | Junio C Hamano | 2012-01-06 | 25 | -102/+114 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | write first for-merge ref to FETCH_HEAD firstjh/fetch-head-update | Joey Hess | 2012-01-03 | 25 | -102/+114 |
* | | | | | | | | | | | | Merge branch 'pw/p4-view-updates' | Junio C Hamano | 2012-01-06 | 3 | -82/+564 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: view spec documentation | Pete Wyckoff | 2012-01-03 | 1 | -13/+27 |
| * | | | | | | | | | | | | git-p4: rewrite view handling | Pete Wyckoff | 2012-01-03 | 2 | -101/+258 |
| * | | | | | | | | | | | | git-p4: support single file p4 client view maps | Gary Gibbons | 2012-01-03 | 2 | -10/+21 |
| * | | | | | | | | | | | | git-p4: sort client views by reverse View number | Gary Gibbons | 2012-01-03 | 2 | -3/+10 |
| * | | | | | | | | | | | | git-p4: fix test for unsupported P4 Client Views | Gary Gibbons | 2012-01-03 | 2 | -3/+6 |
| * | | | | | | | | | | | | git-p4: test client view handling | Pete Wyckoff | 2012-01-03 | 1 | -0/+290 |
* | | | | | | | | | | | | | Sync with 1.7.8.3 | Junio C Hamano | 2012-01-06 | 3 | -5/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |