| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'maint' | Junio C Hamano | 2009-04-07 | 1 | -3/+3 |
|\ |
|
| * | Change double quotes to single quotes in message | Jari Aalto | 2009-04-07 | 1 | -3/+3 |
* | | Merge branch 'js/maint-submodule-checkout' | Junio C Hamano | 2009-04-07 | 1 | -3/+0 |
|\ \ |
|
| * | | Fix 'git checkout <submodule>' to update the index | Johannes Schindelin | 2009-04-02 | 1 | -3/+0 |
| |/ |
|
* | | Merge branch 'jc/name-branch' | Junio C Hamano | 2009-04-06 | 1 | -12/+6 |
|\ \ |
|
| * | | strbuf_check_branch_ref(): a helper to check a refname for a branch | Junio C Hamano | 2009-03-22 | 1 | -4/+3 |
| * | | strbuf_branchname(): a wrapper for branch name shorthands | Junio C Hamano | 2009-03-22 | 1 | -8/+3 |
| * | | Rename interpret/substitute nth_last_branch functions | Junio C Hamano | 2009-03-22 | 1 | -1/+1 |
* | | | builtin-checkout: use warning() instead of fprintf(stderr, "warning: ") | Miklos Vajna | 2009-03-23 | 1 | -2/+2 |
|/ / |
|
* | | Merge branch 'mv/parseopt-ls-files' | Junio C Hamano | 2009-03-20 | 1 | -1/+1 |
|\ \ |
|
| * | | Turn the flags in struct dir_struct into a single variable | Johannes Schindelin | 2009-02-18 | 1 | -1/+1 |
| |/ |
|
* | | Fix neglect of diff_setup()/diff_setup_done() symmetry. | Keith Cascio | 2009-03-04 | 1 | -0/+2 |
|/ |
|
* | Merge branch 'tr/previous-branch' | Junio C Hamano | 2009-01-28 | 1 | -2/+13 |
|\ |
|
| * | checkout: implement "-" abbreviation, add docs and tests | Thomas Rast | 2009-01-17 | 1 | -0/+3 |
| * | sha1_name: tweak @{-N} lookup | Thomas Rast | 2009-01-17 | 1 | -1/+3 |
| * | checkout: implement "@{-N}" shortcut name for N-th last branch | Junio C Hamano | 2009-01-17 | 1 | -2/+8 |
* | | Merge branch 'cb/add-pathspec' | Junio C Hamano | 2009-01-25 | 1 | -3/+3 |
|\ \ |
|
| * | | remove pathspec_match, use match_pathspec instead | Clemens Buchacher | 2009-01-14 | 1 | -3/+3 |
| * | | Merge branch 'jc/maint-do-not-switch-to-non-commit' into maint | Junio C Hamano | 2009-01-11 | 1 | -1/+1 |
| |\ \ |
|
* | | | | Move run_hook() from builtin-commit.c into run-command.c (libgit) | Stephan Beyer | 2009-01-17 | 1 | -17/+5 |
* | | | | checkout: don't crash on file checkout before running post-checkout hook | Stephan Beyer | 2009-01-17 | 1 | -2/+4 |
| |_|/
|/| | |
|
* | | | Merge branch 'jc/maint-do-not-switch-to-non-commit' | Junio C Hamano | 2009-01-03 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | git checkout: do not allow switching to a tree-ish that is not a commit | Junio C Hamano | 2009-01-03 | 1 | -1/+1 |
* | | builtin-checkout.c: check error return from read_cache() | Junio C Hamano | 2008-12-07 | 1 | -2/+5 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-11-27 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | git checkout: don't warn about unborn branch if -f is already passed | Matt McCutchen | 2008-11-27 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-11-12 | 1 | -2/+1 |
|\ \
| |/ |
|
| * | checkout: Fix "initial checkout" detection | Junio C Hamano | 2008-11-12 | 1 | -2/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-11-09 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | checkout: Don't crash when switching away from an invalid branch. | Alexandre Julliard | 2008-11-09 | 1 | -4/+4 |
| * | Merge branch 'db/maint-checkout-b' into maint | Junio C Hamano | 2008-10-18 | 1 | -0/+12 |
| |\ |
|
* | | | Fix mismerge at cdb22c4 in builtin-checkout.c | Junio C Hamano | 2008-10-19 | 1 | -3/+0 |
* | | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -8/+4 |
* | | | do not segfault if make_cache_entry failed | Dmitry Potapov | 2008-10-06 | 1 | -0/+2 |
* | | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 1 | -21/+173 |
|\ \ \ |
|
| * | | | checkout --conflict=<style>: recreate merge in a non-default style | Junio C Hamano | 2008-08-31 | 1 | -1/+9 |
| * | | | checkout -m: recreate merge when checking out of unmerged index | Junio C Hamano | 2008-08-30 | 1 | -2/+102 |
| * | | | checkout --ours/--theirs: allow checking out one side of a conflicting merge | Junio C Hamano | 2008-08-30 | 1 | -1/+38 |
| * | | | checkout -f: allow ignoring unmerged paths when checking out of the index | Junio C Hamano | 2008-08-30 | 1 | -18/+23 |
* | | | | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 2008-09-25 | 1 | -3/+8 |
|\ \ \ \ |
|
| * | | | | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 | 1 | -3/+8 |
* | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-25 | 1 | -1/+1 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | checkout: Do not show local changes when in quiet mode | Jonas Fonseca | 2008-09-25 | 1 | -1/+1 |
* | | | | | Merge branch 'db/maint-checkout-b' | Junio C Hamano | 2008-09-21 | 1 | -0/+12 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Check early that a new branch is new and valid | Daniel Barkalow | 2008-09-21 | 1 | -0/+12 |
| |/ / / |
|
| * | | | Merge branch 'jc/maint-checkout-keep-remove' into maint | Junio C Hamano | 2008-09-18 | 1 | -0/+2 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'jc/maint-checkout-fix' into maint | Junio C Hamano | 2008-09-10 | 1 | -1/+28 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
* | | | | | Merge branch 'jc/maint-checkout-keep-remove' | Junio C Hamano | 2008-09-16 | 1 | -0/+2 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | checkout: do not lose staged removal | Junio C Hamano | 2008-09-09 | 1 | -0/+2 |
| |/ / / |
|
* | | | | Merge branch 'jc/maint-checkout-fix' | Junio C Hamano | 2008-09-07 | 1 | -1/+28 |
|\ \ \ \
| | |/ /
| |/| | |
|