| Commit message (Expand) | Author | Age | Files | Lines |
* | correct type of EMPTY_TREE_SHA1_BIN | Jonathan Nieder | 2011-02-14 | 1 | -1/+1 |
* | Merge branch 'rs/opt-help-text' | Junio C Hamano | 2010-11-24 | 1 | -2/+2 |
|\ |
|
| * | Describe various forms of "be quiet" using OPT__QUIET | Jonathan Nieder | 2010-11-15 | 1 | -1/+1 |
| * | add OPT__FORCE | René Scharfe | 2010-11-15 | 1 | -1/+1 |
| * | add description parameter to OPT__QUIET | René Scharfe | 2010-11-15 | 1 | -1/+1 |
* | | Change "tracking branch" to "remote-tracking branch" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
* | | Replace "remote tracking" with "remote-tracking" | Matthieu Moy | 2010-11-03 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -1/+1 |
|\ |
|
| * | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -1/+1 |
* | | Improvements to `git checkout -h` | Daniel Knittl-Frank | 2010-09-27 | 1 | -6/+6 |
* | | 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 | 1 | -2/+1 |
|\ \ \ |
|
| * | | | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 | 1 | -1/+0 |
| * | | | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 1 | -1/+1 |
| * | | | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 1 | -1/+1 |
* | | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+11 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+7 |
| * | | | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+4 |
| | |/
| |/| |
|
* | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 1 | -1/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 1 | -0/+1 |
| * | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 1 | -1/+1 |
| * | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 1 | -1/+1 |
| |/ |
|
* | | builtin/checkout: Fix message when switching to an existing branch | Ramkumar Ramachandra | 2010-08-20 | 1 | -1/+4 |
* | | Merge branch 'jn/fix-abbrev' | Junio C Hamano | 2010-08-18 | 1 | -1/+0 |
|\ \ |
|
| * | | checkout, commit: remove confusing assignments to rev.abbrev | Jonathan Nieder | 2010-07-27 | 1 | -1/+0 |
| |/ |
|
* | | 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 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+2 |
|\ |
|
| * | Rewrite dynamic structure initializations to runtime assignment | Gary V. Vaughan | 2010-05-31 | 1 | -1/+2 |
* | | log_ref_setup: don't return stack-allocated array | Thomas Rast | 2010-06-12 | 1 | -2/+2 |
* | | checkout --orphan: respect -l option always | Erick Mattos | 2010-06-03 | 1 | -3/+28 |
* | | Merge branch 'em/checkout-orphan' | Junio C Hamano | 2010-05-21 | 1 | -2/+13 |
|\ \
| |/
|/| |
|
| * | git checkout: create unparented branch by --orphan | Erick Mattos | 2010-03-21 | 1 | -2/+13 |
* | | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
* | | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
* | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'lt/deepen-builtin-source' | Junio C Hamano | 2010-03-10 | 1 | -21/+3 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+853 |