Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/clang-lints' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -4/+1 |
|\ | |||||
| * | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lints | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -1/+1 |
| * | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -3/+0 |
* | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -2/+2 |
|\ \ | |||||
| * | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -2/+2 |
* | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -39/+50 |
|\ \ \ | |||||
| * \ \ | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -38/+49 |
| |\ \ \ | |||||
| | * | | | fetch: create status table using strbufjk/maint-fetch-status-table | Jeff King | 2011-12-09 | 1 | -38/+49 |
| * | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -1/+1 |
| * | | | | blame: don't overflow time buffer | Jeff King | 2011-12-13 | 1 | -1/+1 |
* | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-05 | 1 | -2/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | stripspace: fix outdated comment | Jeff King | 2011-12-05 | 1 | -2/+0 |
* | | | | | Merge branch 'jc/maint-name-rev-all' into maint | Junio C Hamano | 2011-11-18 | 1 | -1/+1 |
* | | | | | Merge branch 'dm/pack-objects-update' into maint | Junio C Hamano | 2011-11-08 | 1 | -19/+55 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects: don't traverse objects unnecessarily | Dan McGee | 2011-10-20 | 1 | -6/+12 |
| * | | | | | pack-objects: rewrite add_descendants_to_write_order() iteratively | Dan McGee | 2011-10-18 | 1 | -7/+37 |
| * | | | | | pack-objects: use unsigned int for counter and offset values | Dan McGee | 2011-10-18 | 1 | -6/+6 |
| * | | | | | pack-objects: mark add_to_write_order() as inline | Dan McGee | 2011-10-18 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'bc/attr-ignore-case' into maint | Junio C Hamano | 2011-11-01 | 2 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | attr: read core.attributesfile from git_default_core_config | Junio C Hamano | 2011-10-06 | 1 | -0/+2 |
| * | | | | | builtin/mv.c: plug miniscule memory leak | Brandon Casey | 2011-10-06 | 1 | -1/+5 |
| * | | | | | cleanup: use internal memory allocation wrapper functions everywhere | Brandon Casey | 2011-10-06 | 1 | -1/+1 |
* | | | | | | Merge branch 'cn/fetch-prune' into maint | Junio C Hamano | 2011-11-01 | 2 | -6/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruning | Carlos Martín Nieto | 2011-10-15 | 1 | -2/+21 |
| * | | | | | | fetch: honor the user-provided refspecs when pruning refs | Carlos Martín Nieto | 2011-10-15 | 2 | -5/+10 |
| * | | | | | | fetch: free all the additional refspecs | Carlos Martín Nieto | 2011-10-07 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | clone: Quote user supplied path in a single quote pair | Richard Hartmann | 2011-10-27 | 1 | -2/+2 |
* | | | | | | Merge branch 'jk/argv-array' into maint | Junio C Hamano | 2011-10-26 | 1 | -19/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout: use argv_array API | Jeff King | 2011-09-14 | 1 | -19/+8 |
* | | | | | | | Merge branch 'jc/run-receive-hook-cleanup' into maint | Junio C Hamano | 2011-10-26 | 1 | -19/+52 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refactor run_receive_hook() | Junio C Hamano | 2011-09-12 | 1 | -19/+52 |
* | | | | | | | | Merge branch 'maint-1.7.6' into maint | Junio C Hamano | 2011-10-26 | 1 | -7/+21 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'mz/remote-rename' into maint-1.7.6 | Junio C Hamano | 2011-10-26 | 1 | -7/+21 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | remote: only update remote-tracking branch if updating refspec | Martin von Zweigbergk | 2011-09-11 | 1 | -3/+7 |
| | * | | | | | | | remote rename: warn when refspec was not updated | Martin von Zweigbergk | 2011-09-11 | 1 | -0/+6 |
| | * | | | | | | | remote: "rename o foo" should not rename ref "origin/bar" | Martin von Zweigbergk | 2011-09-11 | 1 | -1/+1 |
| | * | | | | | | | remote: write correct fetch spec when renaming remote 'remote' | Martin von Zweigbergk | 2011-09-11 | 1 | -4/+8 |
| * | | | | | | | | Merge branch 'cb/maint-ls-files-error-report' into maint | Junio C Hamano | 2011-09-23 | 3 | -7/+11 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | describe: Refresh the index when run with --dirty | Allan Caffee | 2011-09-23 | 1 | -2/+15 |
| * | | | | | | | | | Merge branch 'jc/maint-clone-alternates' into maint | Junio C Hamano | 2011-09-23 | 1 | -29/+90 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-clone-gitdir' into maint | Junio C Hamano | 2011-09-23 | 2 | -2/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/check-ref-format-print-normalize' into maint | Junio C Hamano | 2011-09-23 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/maint-autofix-tag-in-head' into maint | Junio C Hamano | 2011-10-21 | 3 | -59/+66 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Accept tags in HEAD or MERGE_HEAD | Nguyễn Thái Ngọc Duy | 2011-09-18 | 3 | -8/+7 |
| * | | | | | | | | | | | | | merge: remove global variable head[] | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -44/+53 |
| * | | | | | | | | | | | | | merge: use return value of resolve_ref() to determine if HEAD is invalid | Nguyễn Thái Ngọc Duy | 2011-09-18 | 1 | -1/+1 |
| * | | | | | | | | | | | | | merge: keep stash[] a local variable | Nguyễn Thái Ngọc Duy | 2011-08-26 | 1 | -17/+16 |
* | | | | | | | | | | | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -2/+9 |
* | | | | | | | | | | | | | | Merge branch 'il/archive-err-signal' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Support ERR in remote archive like in fetch/push | Ilari Liusvaara | 2011-10-05 | 1 | -0/+2 |