Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-strbuf-missing-init' | Junio C Hamano | 2011-12-22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Update jk/maint-strbuf-missing-init to builtin/ rename | Junio C Hamano | 2011-12-18 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-tree-combined-clean-up' | Junio C Hamano | 2011-12-22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | use struct sha1_array in diff_tree_combined() | René Scharfe | 2011-12-17 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/grep-threading' | Junio C Hamano | 2011-12-22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | grep: disable threading in non-worktree case | Thomas Rast | 2011-12-16 | |
| * | | | | | | | | | | | | | | | | | | grep: enable threading with -p and -W using lazy attribute lookup | Thomas Rast | 2011-12-16 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/war-on-nul-in-commit' | Junio C Hamano | 2011-12-22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | Convert commit_tree() to take strbuf as message | Nguyễn Thái Ngọc Duy | 2011-12-15 | |
| * | | | | | | | | | | | | | | | | | | merge: abort if fails to commit | Nguyễn Thái Ngọc Duy | 2011-12-15 | |
* | | | | | | | | | | | | | | | | | | | Sync with v1.7.8.1 | Junio C Hamano | 2011-12-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | / / / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | | | builtin/init-db.c: eliminate -Wformat warning on Solaris | Ævar Arnfjörð Bjarmason | 2011-12-20 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-signed-tag' | Junio C Hamano | 2011-12-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | commit: do not lose mergetag header when not amending | Junio C Hamano | 2011-12-20 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | 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/fetch-no-tail-match-refs' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | fetch-pack: match refs exactly | Jeff King | 2011-12-13 | |
| * | | | | | | | | | | | | | | | | | drop "match" parameter from get_remote_heads | Jeff King | 2011-12-13 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | Rename resolve_ref() to resolve_ref_unsafe() | Nguyễn Thái Ngọc Duy | 2011-12-13 | |
| * | | | | | | | | | | | | | | | | | | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 2011-12-13 | |
| * | | | | | | | | | | | | | | | | | | revert: convert resolve_ref() to read_ref_full() | Nguyễn Thái Ngọc Duy | 2011-12-12 | |
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | 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' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | 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 'ci/stripspace-docs' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Update documentation for stripspace | Conrad Irwin | 2011-12-12 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge branch 'tr/cache-tree' | Junio C Hamano | 2011-12-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | reset: update cache-tree data when appropriate | Thomas Rast | 2011-12-06 | |
| * | | | | | | | | | | | | | | | | commit: write cache-tree data when writing index anyway | Thomas Rast | 2011-12-06 | |
| * | | | | | | | | | | | | | | | | Refactor cache_tree_update idiom from commit | Thomas Rast | 2011-12-06 | |
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/commit-amend-no-edit' | Junio C Hamano | 2011-12-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | commit: honour --no-edit | Junio C Hamano | 2011-12-08 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/stream-to-pack' | Junio C Hamano | 2011-12-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |