Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/fix-cherry-pick-root' | Junio C Hamano | 2010-10-06 | 1 | -1/+1 |
|\ | |||||
| * | builtin/revert.c: don't dereference a NULL pointer | Brandon Casey | 2010-09-27 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2010-10-06 | 4 | -16/+22 |
|\ \ | |||||
| * | | do not depend on signed integer overflow | Erik Faye-Lund | 2010-10-06 | 3 | -3/+3 |
| * | | init: plug tiny one-time memory leak | Jonathan Nieder | 2010-10-06 | 1 | -13/+19 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-09-30 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix typo in pack-objects' usage | Johannes Schindelin | 2010-09-30 | 1 | -1/+1 |
* | | | Merge branch 'jk/read-tree-empty' | Junio C Hamano | 2010-09-29 | 1 | -1/+9 |
|\ \ \ | |||||
| * | | | read-tree: deprecate syntax without tree-ish args | Jan Krüger | 2010-09-10 | 1 | -1/+9 |
* | | | | Merge branch 'rr/format-patch-count-without-merges' | Junio C Hamano | 2010-09-29 | 1 | -6/+1 |
|\ \ \ \ | |||||
| * | | | | format-patch: Don't go over merge commits | Ramkumar Ramachandra | 2010-08-27 | 1 | -6/+1 |
* | | | | | Merge branch 'rr/fmt-merge-msg' | Junio C Hamano | 2010-09-29 | 2 | -41/+51 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | merge: Make 'merge.log' an integer or boolean option | Ramkumar Ramachandra | 2010-09-09 | 2 | -10/+13 |
| * | | | | merge: Make '--log' an integer option for number of shortlog entries | Ramkumar Ramachandra | 2010-09-09 | 2 | -17/+28 |
| * | | | | fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len | Ramkumar Ramachandra | 2010-09-09 | 2 | -24/+20 |
* | | | | | Improvements to `git checkout -h` | Daniel Knittl-Frank | 2010-09-27 | 1 | -6/+6 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'dr/maint-ls-tree-prefix-recursion-fix' | Junio C Hamano | 2010-09-15 | 1 | -0/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | ls-tree $di $dir: do not mistakenly recurse into directories | Junio C Hamano | 2010-09-12 | 1 | -0/+2 |
| * | | | revert: Fix trivial comment style issue | Elijah Newren | 2010-09-06 | 1 | -1/+0 |
* | | | | builtin/fetch.c: comment that branch->remote_name is usable when has_merge | Brandon Casey | 2010-09-09 | 1 | -0/+3 |
* | | | | Merge branch 'jh/error-removing-missing-note' | Junio C Hamano | 2010-09-08 | 1 | -4/+10 |
|\ \ \ \ | |||||
| * | | | | notes: Don't create (empty) commit when removing non-existing notes | Johan Herland | 2010-08-31 | 1 | -4/+10 |
* | | | | | Merge branch 'bc/maint-fetch-url-only' | Junio C Hamano | 2010-09-08 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/fetch.c: ignore merge config when not fetching from branch's remote | Brandon Casey | 2010-08-25 | 1 | -1/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-09-08 | 1 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: ensure that a renamed file is printed after all references | Johannes Sixt | 2010-09-08 | 1 | -1/+9 |
* | | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-09-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/clean.c: Use STRING_LIST_INIT_NODUP. | Thiago Farina | 2010-09-06 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-09-04 | 1 | -4/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodules | Jens Lehmann | 2010-08-30 | 1 | -0/+5 |
| * | | | | | | | checkout: respect diff.ignoreSubmodules setting | Johannes Schindelin | 2010-08-25 | 1 | -4/+12 |
* | | | | | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 2 | -4/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 | 2 | -2/+0 |
| * | | | | | | | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 2 | -2/+2 |
| * | | | | | | | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'nd/clone-depth-zero' | Junio C Hamano | 2010-09-03 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clone: warn users --depth is ignored in local clones | Nguyễn Thái Ngọc Duy | 2010-08-24 | 1 | -2/+5 |
* | | | | | | | | | | Merge branch 'jn/apply-filename-with-sp' | Junio C Hamano | 2010-09-03 | 1 | -38/+211 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: handle traditional patches with space in filename | Jonathan Nieder | 2010-08-21 | 1 | -14/+179 |
| * | | | | | | | | | | apply: split quoted filename handling into new function | Jonathan Nieder | 2010-08-21 | 1 | -30/+38 |
* | | | | | | | | | | | Merge branch 'jn/merge-custom-no-trivial' | Junio C Hamano | 2010-09-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge: let custom strategies intervene in trivial merges | Jonathan Nieder | 2010-08-15 | 1 | -0/+1 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jn/update-contrib-example-merge' | Junio C Hamano | 2010-09-03 | 3 | -6/+58 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | fmt-merge-msg -m to override merge title | Jonathan Nieder | 2010-08-18 | 1 | -2/+16 |
| * | | | | | | | | | | merge-base --independent to print reduced parent list in a merge | Jonathan Nieder | 2010-08-18 | 1 | -6/+15 |
| * | | | | | | | | | | merge-base --octopus to mimic show-branch --merge-base | Jonathan Nieder | 2010-08-18 | 1 | -3/+32 |
| * | | | | | | | | | | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 2010-08-18 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 5 | -26/+64 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 4 | -5/+32 |
| * | | | | | | | | | | rerere: migrate to parse-options API | Jonathan Nieder | 2010-08-06 | 1 | -24/+28 |