| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | checkout: do not check out unmerged higher stages randomly | Junio C Hamano | 2008-08-30 | 1 | -1/+28 |
| * | | | | Merge branch 'maint' | Junio C Hamano | 2008-09-03 | 1 | -6/+4 |
| |\ \ \ \
| | |/ /
| |/| /
| |_|/
|/| | |
|
| | * | | checkout: fix message when leaving detached HEAD | Jeff King | 2008-09-03 | 1 | -6/+4 |
| | |/ |
|
| * | | Extend "checkout --track" DWIM to support more cases | Alex Riesen | 2008-08-22 | 1 | -13/+13 |
| * | | checkout --track: make up a sensible branch name if '-b' was omitted | Johannes Schindelin | 2008-08-11 | 1 | -3/+18 |
| |/ |
|
| * | git-checkout: improve error messages, detect ambiguities. | Pierre Habouzit | 2008-07-24 | 1 | -17/+65 |
| * | Merge branch 'maint' into ph/checkout | Junio C Hamano | 2008-07-23 | 1 | -1/+2 |
| |\ |
|
| | * | git-checkout: fix command line parsing. | Pierre Habouzit | 2008-07-23 | 1 | -1/+2 |
| * | | add context pointer to read_tree_recursive() | René Scharfe | 2008-07-15 | 1 | -2/+2 |
| * | | Refactor "tracking statistics" code used by "git checkout" | Junio C Hamano | 2008-07-02 | 1 | -88/+6 |
| |/ |
|
| * | checkout: "best effort" checkout | Junio C Hamano | 2008-05-29 | 1 | -4/+18 |
| * | checkout: consolidate reset_{to_new,clean_to_new}() | Junio C Hamano | 2008-05-29 | 1 | -35/+15 |
| * | checkout: make reset_clean_to_new() not die by itself | Junio C Hamano | 2008-05-28 | 1 | -3/+6 |
| * | "git checkout -- paths..." should error out when paths cannot be written | Junio C Hamano | 2008-05-28 | 1 | -2/+5 |
| * | Merge branch 'js/config-cb'v1.5.6-rc0 | Junio C Hamano | 2008-05-25 | 1 | -1/+1 |
| |\ |
|
| | * | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 | 1 | -1/+1 |
| * | | Merge branch 'jc/unpack-trees-reword' | Junio C Hamano | 2008-05-25 | 1 | -0/+2 |
| |\ \ |
|
| | * | | unpack-trees: allow Porcelain to give different error messages | Junio C Hamano | 2008-05-19 | 1 | -0/+2 |
| | |/ |
|
| * | | Extend interface of add_files_to_cache to allow ignore indexing errors | Alex Riesen | 2008-05-12 | 1 | -1/+1 |
| |/ |
|
| * | Merge branch 'maint' | Junio C Hamano | 2008-05-03 | 1 | -1/+1 |
| |\ |
|
| | * | checkout: don't rfc2047-encode oneline on detached HEAD | Jeff King | 2008-05-03 | 1 | -1/+1 |
| * | | git checkout: add -t alias for --track | Miklos Vajna | 2008-04-27 | 1 | -1/+1 |
| |/ |
|
| * | Make 'unpack_trees()' have a separate source and destination index | Linus Torvalds | 2008-03-09 | 1 | -3/+6 |
| * | Make 'unpack_trees()' take the index to work on as an argument | Linus Torvalds | 2008-03-09 | 1 | -0/+6 |
| * | cleanup: remove unused git_checkout_config | Denis Cheng | 2008-03-02 | 1 | -6/+1 |
| * | Write index file on any checkout of files | Daniel Barkalow | 2008-02-29 | 1 | -15/+15 |
