Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2013-03-21 | 1 | -1/+1 |
|\ | |||||
| * | drop some obsolete "x = x" compiler warning hacks | Jeff King | 2013-03-21 | 1 | -1/+1 |
* | | Merge branch 'jk/mailsplit-maildir-muttsort' | Junio C Hamano | 2013-03-21 | 1 | -0/+23 |
|\ \ | |||||
| * | | mailsplit: sort maildir filenames more cleverly | Jeff King | 2013-03-02 | 1 | -0/+23 |
* | | | Merge branch 'mg/gpg-interface-using-status' | Junio C Hamano | 2013-03-21 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | gpg_interface: allow to request status return | Michael J Gruber | 2013-02-14 | 2 | -2/+2 |
* | | | | Merge branch 'nd/branch-error-cases' | Junio C Hamano | 2013-03-21 | 1 | -0/+27 |
|\ \ \ \ | |||||
| * | | | | branch: segfault fixes and validation | Nguyễn Thái Ngọc Duy | 2013-02-23 | 1 | -0/+27 |
* | | | | | Merge branch 'ap/maint-update-index-h-is-for-help' | Junio C Hamano | 2013-03-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | update-index: allow "-h" to also display options | Antoine Pelisse | 2013-02-23 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' | Junio C Hamano | 2013-03-21 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | git-commit: only append a newline to -m mesg if necessary | Brandon Casey | 2013-02-19 | 1 | -1/+3 |
* | | | | | | Merge branch 'nd/count-garbage' | Junio C Hamano | 2013-03-21 | 1 | -7/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | count-objects: report how much disk space taken by garbage files | Nguyễn Thái Ngọc Duy | 2013-02-15 | 1 | -6/+12 |
| * | | | | | | count-objects: report garbage files in pack directory too | Nguyễn Thái Ngọc Duy | 2013-02-15 | 1 | -1/+11 |
* | | | | | | | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -8/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fetch: use struct ref to represent refs to be fetched | Junio C Hamano | 2013-02-07 | 1 | -8/+32 |
* | | | | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow' | Junio C Hamano | 2013-03-21 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | index-pack: fix buffer overflow caused by translations | Nguyễn Thái Ngọc Duy | 2013-03-16 | 1 | -4/+5 |
* | | | | | | | | | Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' | Junio C Hamano | 2013-03-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Fix ".git/refs" stragglers | Greg Price | 2013-02-24 | 1 | -2/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | add: update pathless 'add [-u|-A]' warning to reflect change of plan | Matthieu Moy | 2013-03-11 | 1 | -3/+3 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | name-hash: allow hashing an empty string | Junio C Hamano | 2013-02-19 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jc/hidden-refs' | Junio C Hamano | 2013-02-17 | 1 | -0/+24 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | upload/receive-pack: allow hiding ref hierarchies | Junio C Hamano | 2013-02-07 | 1 | -0/+24 |
* | | | | | | | Merge branch 'jc/extended-fake-ancestor-for-gitlink' | Junio C Hamano | 2013-02-14 | 1 | -2/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply: verify submodule commit object name better | Junio C Hamano | 2013-02-05 | 1 | -2/+38 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-02-12 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Replace filepattern with pathspec for consistency | Matthieu Moy | 2013-02-12 | 2 | -3/+3 |
| * | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 | 1 | -14/+16 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into maint | Junio C Hamano | 2013-02-04 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/help' into maint | Junio C Hamano | 2013-02-04 | 1 | -18/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-blobs' into maint | Junio C Hamano | 2013-02-04 | 2 | -37/+59 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'jk/apply-similaritly-parsing' | Junio C Hamano | 2013-02-08 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | builtin/apply: tighten (dis)similarity index parsing | John Keeping | 2013-02-03 | 1 | -4/+6 |
* | | | | | | | | | | | Merge branch 'nd/branch-error-cases' | Junio C Hamano | 2013-02-07 | 1 | -9/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | branch: let branch filters imply --list | Jeff King | 2013-01-31 | 1 | -0/+3 |
| * | | | | | | | | | | branch: mark more strings for translation | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -5/+6 |
| * | | | | | | | | | | Merge branch 'nd/edit-branch-desc-while-detached' into HEAD | Junio C Hamano | 2013-01-30 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | branch: give a more helpful message on redundant arguments | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -2/+2 |
| * | | | | | | | | | | branch: reject -D/-d without branch name | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -2/+4 |
* | | | | | | | | | | | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-05 | 1 | -14/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | apply: diagnose incomplete submodule object name better | Junio C Hamano | 2013-01-31 | 1 | -1/+5 |
| * | | | | | | | | | | apply: simplify build_fake_ancestor() | Junio C Hamano | 2013-01-31 | 1 | -14/+12 |
* | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-04 | 2 | -30/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | logmsg_reencode: lazily load missing commit buffers | Jeff King | 2013-01-26 | 1 | -13/+0 |
| * | | | | | | | | | | | logmsg_reencode: never return NULL | Jeff King | 2013-01-26 | 2 | -17/+6 |
| * | | | | | | | | | | | commit: drop useless xstrdup of commit message | Jeff King | 2013-01-26 | 1 | -1/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'mm/add-u-A-sans-pathspec' | Junio C Hamano | 2013-02-04 | 1 | -1/+43 |
|\ \ \ \ \ \ \ \ \ \ \ |