Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2012-01-12 |
|\ | |||
| * | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-12 |
| |\ | |||
| | * | thin-pack: try harder to use preferred base objects as base | Jeff King | 2012-01-12 |
* | | | Merge branch 'jv/maint-config-set' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ | |||
| * | | | Fix an incorrect reference to --set-all. | Jelmer Vernooij | 2011-12-27 |
* | | | | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ | |||
| * | | | | checkout_merged(): squelch false warning from some gcc | Junio C Hamano | 2011-12-15 |
| * | | | | checkout -m: no need to insist on having all 3 stages | Junio C Hamano | 2011-12-06 |
* | | | | | Merge branch 'jk/maint-strbuf-missing-init' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ | |||
| * | | | | | Update jk/maint-strbuf-missing-init to builtin/ rename | Junio C Hamano | 2011-12-18 |
* | | | | | | Merge branch 'jn/maint-sequencer-fixes' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ \ | |||
| * | | | | | | revert: stop creating and removing sequencer-old directory | Jonathan Nieder | 2011-12-12 |
| * | | | | | | revert: do not remove state until sequence is finished | Jonathan Nieder | 2011-12-12 |
| * | | | | | | revert: allow single-pick in the middle of cherry-pick sequence | Jonathan Nieder | 2011-12-12 |
| * | | | | | | revert: pass around rev-list args in already-parsed form | Jonathan Nieder | 2011-12-12 |
| * | | | | | | revert: allow cherry-pick --continue to commit before resuming | Jonathan Nieder | 2011-12-12 |
| * | | | | | | revert: give --continue handling its own function | Jonathan Nieder | 2011-12-12 |
* | | | | | | | Merge branch 'jk/maint-mv' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | mv: be quiet about overwriting | Jeff King | 2011-12-12 |
| * | | | | | | | mv: improve overwrite warning | Jeff King | 2011-12-12 |
| * | | | | | | | mv: make non-directory destination error more clear | Jeff King | 2011-12-12 |
| * | | | | | | | mv: honor --verbose flag | Jeff King | 2011-12-12 |
* | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 |
| * | | | | | | | | drop "match" parameter from get_remote_heads | Jeff King | 2011-12-13 |
* | | | | | | | | | Merge branch 'ci/stripspace-docs' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Update documentation for stripspace | Conrad Irwin | 2011-12-12 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jn/branch-move-to-self' into maint | Junio C Hamano | 2011-12-28 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Allow checkout -B <current-branch> to update the current branch | Jonathan Nieder | 2011-11-28 |
| * | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD" | Jonathan Nieder | 2011-11-28 |
* | | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | builtin/apply.c: report error on failure to recognize input | Brandon Casey | 2011-12-05 |
* | | | | | | | | | | | clone: the -o option has nothing to do with <branch> | Carlos Martín Nieto | 2011-12-21 |
* | | | | | | | | | | | builtin/log: remove redundant initialization | Michael Schubert | 2011-12-21 |
* | | | | | | | | | | | Merge branch 'ms/commit-cc-option-helpstring' into maint | Junio C Hamano | 2011-12-21 |
* | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on Solaris | Ævar Arnfjörð Bjarmason | 2011-12-20 |
* | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' into maint | Junio C Hamano | 2011-12-13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | pack-object: tolerate broken packs that have duplicated objects | Junio C Hamano | 2011-11-16 |
* | | | | | | | | | | | | Merge branch 'jc/index-pack-reject-dups' into maint | Junio C Hamano | 2011-12-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twice | Junio C Hamano | 2011-11-16 |
* | | | | | | | | | | | | | Merge branch 'nd/misc-cleanups' into maint | Junio C Hamano | 2011-12-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | tree_entry_interesting(): give meaningful names to return values | Nguyễn Thái Ngọc Duy | 2011-10-27 |
| * | | | | | | | | | | | | | tree-walk.c: do not leak internal structure in tree_entry_len() | Nguyễn Thái Ngọc Duy | 2011-10-27 |
* | | | | | | | | | | | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge branch 'ab/clang-lints' into maint-1.7.7 | Junio C Hamano | 2011-12-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.c | Ævar Arnfjörð Bjarmason | 2011-11-06 |
| | * | | | | | | | | | | | | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 |
| * | | | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7 | Junio C Hamano | 2011-12-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 |
| * | | | | | | | | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |