Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pack-objects: do not get distracted by broken symrefs | Johannes Schindelin | 2015-10-08 | 2 | -2/+8 |
* | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 | 1 | -0/+13 |
* | Git 2.4.9v2.4.9 | Junio C Hamano | 2015-09-04 | 4 | -3/+13 |
* | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 | 7 | -26/+49 |
|\ | |||||
| * | Git 2.3.9v2.3.9 | Junio C Hamano | 2015-09-04 | 4 | -3/+13 |
| * | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 | 6 | -25/+38 |
| |\ | |||||
| | * | Git 2.2.3v2.2.3 | Junio C Hamano | 2015-09-04 | 4 | -3/+13 |
| | * | Merge branch 'jk/long-paths' into maint-2.2 | Junio C Hamano | 2015-09-04 | 4 | -24/+27 |
| | |\ | |||||
| | | * | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 | 1 | -2/+4 |
| | | * | read_info_alternates: handle paths larger than PATH_MAX | Jeff King | 2015-09-04 | 1 | -6/+3 |
| | | * | notes: use a strbuf in add_non_note | Jeff King | 2015-09-04 | 1 | -9/+10 |
| | | * | verify_absent: allow filenames longer than PATH_MAX | Jeff King | 2015-09-04 | 1 | -7/+10 |
| | |/ | |||||
* | | | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 | 4 | -5/+25 |
* | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 | 2 | -1/+26 |
|\ \ \ | |||||
| * | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behind | Johannes Schindelin | 2015-06-29 | 2 | -2/+6 |
| * | | | t3404: demonstrate CHERRY_PICK_HEAD bug | Johannes Schindelin | 2015-06-29 | 1 | -0/+21 |
| | |/ | |/| | |||||
* | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 | 1 | -13/+6 |
|\ \ \ | |||||
| * | | | clone: simplify string handling in guess_dir_name() | Sebastian Schuberth | 2015-07-09 | 1 | -13/+6 |
* | | | | Merge branch 'sg/completion-commit-cleanup' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | completion: teach 'scissors' mode to 'git commit --cleanup=' | SZEDER Gábor | 2015-06-08 | 1 | -1/+1 |
* | | | | | Merge branch 'pt/am-abort-fix' into maint | Junio C Hamano | 2015-08-03 | 2 | -8/+104 |
|\ \ \ \ \ | |||||
| * | | | | | am --abort: keep unrelated commits on unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+12 |
| * | | | | | am --abort: support aborting to unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+25 |
| * | | | | | am --abort: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 2 | -1/+28 |
| * | | | | | am --skip: support skipping while on unborn branch | Paul Tan | 2015-06-08 | 2 | -3/+11 |
| * | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+11 |
| * | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 2 | -1/+17 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 | 3 | -7/+83 |
|\ \ \ \ \ | |||||
| * | | | | | read_loose_refs(): treat NULL_SHA1 loose references as broken | Michael Haggerty | 2015-06-08 | 2 | -1/+11 |
| * | | | | | read_loose_refs(): simplify function logic | Michael Haggerty | 2015-06-03 | 1 | -7/+12 |
| * | | | | | for-each-ref: report broken references correctly | Michael Haggerty | 2015-06-02 | 2 | -1/+6 |
| * | | | | | t6301: new tests of for-each-ref error handling | Michael Haggerty | 2015-06-02 | 1 | -0/+56 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'sg/commit-cleanup-scissors' into maint | Junio C Hamano | 2015-08-03 | 2 | -5/+28 |
|\ \ \ \ \ | |||||
| * | | | | | commit: cope with scissors lines in commit message | SZEDER Gábor | 2015-06-09 | 2 | -5/+28 |
| | |_|/ / | |/| | | | |||||
* | | | | | Git 2.4.7v2.4.7 | Junio C Hamano | 2015-07-27 | 4 | -3/+57 |
* | | | | | Merge branch 'jk/pretty-encoding-doc' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | docs: clarify that --encoding can produce invalid sequences | Jeff King | 2015-06-17 | 1 | -1/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'tb/checkout-doc' into maint | Junio C Hamano | 2015-07-27 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | git-checkout.txt: document "git checkout <pathspec>" better | Torsten Bögershausen | 2015-06-17 | 1 | -1/+5 |
* | | | | | | Merge branch 'ls/hint-rev-list-count' into maint | Junio C Hamano | 2015-07-27 | 2 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-list: add --count to usage guide | Lawrence Siebert | 2015-07-01 | 2 | -0/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'mm/branch-doc-updates' into maint | Junio C Hamano | 2015-07-27 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/branch: document -M and -D in terms of --force | Matthieu Moy | 2015-07-06 | 1 | -2/+2 |
| * | | | | | | Documentation/branch: document -d --force and -m --force | Matthieu Moy | 2015-07-06 | 1 | -0/+4 |
* | | | | | | | Merge branch 'jc/fsck-retire-require-eoh' into maint | Junio C Hamano | 2015-07-27 | 1 | -4/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fsck: it is OK for a tag and a commit to lack the body | Junio C Hamano | 2015-06-28 | 1 | -4/+13 |
* | | | | | | | | Merge branch 'et/http-proxyauth' into maint | Junio C Hamano | 2015-07-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http: always use any proxy auth method available | Enrique Tobis | 2015-06-29 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint | Junio C Hamano | 2015-07-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pager: do not leak "GIT_PAGER_IN_USE" to the pager | Junio C Hamano | 2015-07-04 | 1 | -0/+1 |