Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 2 | -2/+4 |
|\ | |||||
| * | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 2 | -0/+2 |
| * | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 2 | -2/+2 |
| * | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 2 | -2/+2 |
* | | builtin/checkout: Fix message when switching to an existing branch | Ramkumar Ramachandra | 2010-08-20 | 1 | -1/+4 |
* | | Merge branch 'tf/string-list-init' | Junio C Hamano | 2010-08-18 | 10 | -21/+21 |
|\ \ | |||||
| * | | string_list: Add STRING_LIST_INIT macro and make use of it. | Thiago Farina | 2010-07-05 | 10 | -21/+21 |
* | | | Merge branch 'cc/find-commit-subject' | Junio C Hamano | 2010-08-18 | 2 | -30/+12 |
|\ \ \ | |||||
| * | | | blame: use find_commit_subject() instead of custom code | Christian Couder | 2010-07-23 | 1 | -15/+7 |
| * | | | revert: rename variables related to subject in get_message() | Christian Couder | 2010-07-23 | 1 | -5/+5 |
| * | | | revert: refactor code to find commit subject in find_commit_subject() | Christian Couder | 2010-07-23 | 1 | -12/+2 |
| * | | | revert: fix off by one read when searching the end of a commit subject | Christian Couder | 2010-07-23 | 1 | -1/+1 |
* | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-08-18 | 5 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and status | Jens Lehmann | 2010-08-09 | 5 | -0/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jn/fix-abbrev' | Junio C Hamano | 2010-08-18 | 2 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | checkout, commit: remove confusing assignments to rev.abbrev | Jonathan Nieder | 2010-07-27 | 2 | -2/+0 |
* | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-08-18 | 1 | -1/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Add -e/--exclude to git-clean. | Jared Hance | 2010-07-20 | 1 | -1/+16 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jn/rebase-rename-am' | Junio C Hamano | 2010-08-18 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Teach "apply --index-info" to handle rename patches | Junio C Hamano | 2010-07-23 | 1 | -2/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'ar/string-list-foreach' | Junio C Hamano | 2010-08-18 | 2 | -52/+35 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Convert the users of for_each_string_list to for_each_string_list_item macro | Alex Riesen | 2010-07-05 | 2 | -52/+35 |
* | | | | | Merge branch 'tc/checkout-B' | Junio C Hamano | 2010-08-18 | 1 | -6/+26 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/checkout: learn -B | Tay Ray Chuan | 2010-06-25 | 1 | -5/+24 |
| * | | | | | builtin/checkout: reword hint for -b | Tay Ray Chuan | 2010-06-25 | 1 | -1/+2 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-12 | 2 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | push: mention "git pull" in error message for non-fast forwards | Matthieu Moy | 2010-08-12 | 1 | -2/+2 |
| * | | | | | | index-pack: Don't follow replace refs. | Nelson Elhage | 2010-08-12 | 1 | -0/+2 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-09 | 3 | -22/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | prune: allow --dry-run for -n and --verbose for -v | René Scharfe | 2010-08-09 | 1 | -3/+2 |
| * | | | | | | notes: allow --dry-run for -n and --verbose for -v | René Scharfe | 2010-08-09 | 1 | -2/+3 |
| * | | | | | | Allow "check-ref-format --branch" from subdirectory | Jonathan Nieder | 2010-08-06 | 1 | -0/+2 |
| * | | | | | | check-ref-format: handle subcommands in separate functions | Jonathan Nieder | 2010-08-06 | 1 | -17/+25 |
* | | | | | | | ls-files: learn a debugging dump format | Thomas Rast | 2010-08-02 | 1 | -0/+9 |
* | | | | | | | builtin/push.c: remove useless temporary variable | Jared Hance | 2010-08-02 | 1 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | commit: remove full stop from usage help for -u | Stephen Boyd | 2010-07-27 | 1 | -1/+1 |
* | | | | | | Clarify help message when no remote is specified in fetch/pull. | Matthieu Moy | 2010-07-27 | 1 | -1/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Cast execl*() NULL sentinels to (char *) | Thomas Rast | 2010-07-25 | 1 | -6/+6 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'jl/add-n-ignore-missing' | Junio C Hamano | 2010-07-19 | 1 | -4/+12 |
|\ \ \ \ | |||||
| * | | | | git add: Add the "--ignore-missing" option for the dry run | Jens Lehmann | 2010-07-12 | 1 | -4/+12 |
* | | | | | Merge branch 'jc/diff-merge-base-multi' | Junio C Hamano | 2010-07-16 | 1 | -13/+0 |
* | | | | | Merge branch 'wp/merge-tree-fix' | Junio C Hamano | 2010-07-15 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'js/merge-rr-fix' | Junio C Hamano | 2010-07-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | MERGE_RR is in .git, not .git/rr-cache | Jay Soffian | 2010-07-14 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/diff-merge-base-multi' | Junio C Hamano | 2010-07-15 | 1 | -8/+23 |
* | | | | | Merge branch 'jn/grep-open' | Junio C Hamano | 2010-07-15 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | grep -O: Do not pass color sequences as filenames to pager | Nazri Ramliy | 2010-07-07 | 1 | -0/+1 |
* | | | | | | Merge branch 'jk/maint-status-keep-index-timestamp' | Junio C Hamano | 2010-07-15 | 1 | -5/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | do not write out index when status does not have to | Junio C Hamano | 2010-07-06 | 1 | -5/+11 |