Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/const-struct-cache-entry' | Junio C Hamano | 2013-07-22 | 1 | -4/+4 |
|\ | |||||
| * | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -4/+4 |
* | | Merge branch 'rr/rebase-checkout-reflog' | Junio C Hamano | 2013-07-11 | 1 | -3/+8 |
|\ \ | |/ |/| | |||||
| * | checkout: respect GIT_REFLOG_ACTION | Ramkumar Ramachandra | 2013-06-17 | 1 | -3/+8 |
* | | builtin/checkout.c: don't leak memory in check_tracking_name | Brandon Casey | 2013-06-18 | 1 | -2/+5 |
* | | Merge branch 'jh/checkout-auto-tracking' | Junio C Hamano | 2013-05-29 | 1 | -20/+22 |
|\ \ | |/ |/| | |||||
| * | checkout: Use remote refspecs when DWIMming tracking branches | Johan Herland | 2013-04-21 | 1 | -20/+22 |
* | | Merge branch 'nd/checkout-keep-sparse' | Junio C Hamano | 2013-04-22 | 1 | -0/+5 |
|\ \ | |/ |/| | |||||
| * | checkout: add --ignore-skip-worktree-bits in sparse checkout mode | Nguyễn Thái Ngọc Duy | 2013-04-15 | 1 | -0/+5 |
* | | checkout: abbreviate hash in suggest_reattach | Kevin Bracey | 2013-04-08 | 1 | -1/+1 |
|/ | |||||
* | checkout: avoid unnecessary match_pathspec calls | Nguyễn Thái Ngọc Duy | 2013-03-27 | 1 | -7/+36 |
* | checkout: print a message when switching unborn branches | Jeff King | 2012-11-15 | 1 | -0/+3 |
* | Merge branch 'nd/checkout-option-parsing-fix' | Junio C Hamano | 2012-09-14 | 1 | -116/+158 |
|\ | |||||
| * | checkout: reorder option handling | Nguyễn Thái Ngọc Duy | 2012-09-11 | 1 | -77/+112 |
| * | checkout: move more parameters to struct checkout_opts | Nguyễn Thái Ngọc Duy | 2012-08-29 | 1 | -33/+35 |
| * | checkout: pass "struct checkout_opts *" as const pointer | Nguyễn Thái Ngọc Duy | 2012-08-29 | 1 | -16/+21 |
* | | Merge branch 'nd/i18n-parseopt-help' | Junio C Hamano | 2012-09-07 | 1 | -20/+20 |
|\ \ | |/ |/| | |||||
| * | i18n: checkout: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-20 | 1 | -20/+20 |
* | | Merge branch 'tr/void-diff-setup-done' | Junio C Hamano | 2012-08-22 | 1 | -2/+1 |
|\ \ | |/ |/| | |||||
| * | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -2/+1 |
* | | Merge branch 'jk/maint-checkout-orphan-check-fix' | Junio C Hamano | 2012-07-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | checkout: don't confuse ref and object flags | Jeff King | 2012-07-25 | 1 | -1/+1 |
* | | | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 2012-07-11 | 1 | -1/+2 |
* | | | Merge branch 'cw/no-detaching-an-unborn' | Junio C Hamano | 2012-07-09 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 1 | -0/+2 |
* | | | | Merge branch 'ap/checkout-no-progress-for-non-tty' | Junio C Hamano | 2012-05-25 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | checkout: no progress messages if !isatty(2). | Avery Pennarun | 2012-05-24 | 1 | -2/+2 |
| * | | | | Merge branch 'ef/checkout-empty' into maint | Junio C Hamano | 2012-05-14 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'ef/checkout-empty' | Junio C Hamano | 2012-05-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | checkout: do not corrupt HEAD on empty repo | Erik Faye-Lund | 2012-05-08 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'js/checkout-detach-count' | Junio C Hamano | 2012-05-10 | 1 | -6/+7 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | checkout (detached): truncate list of orphaned commits at the new HEAD | Johannes Sixt | 2012-05-04 | 1 | -6/+7 |
* | | | | | Merge branch 'jk/branch-quiet' | Junio C Hamano | 2012-04-16 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | checkout: suppress tracking message with "-q" | Jeff King | 2012-03-26 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'jc/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-02-16 | 1 | -0/+19 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge branch 'jc/checkout-out-of-unborn' | Junio C Hamano | 2012-02-12 | 1 | -0/+19 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unborn | Junio C Hamano | 2012-02-06 | 1 | -0/+19 |
| * | | | Merge branch 'cb/maint-ls-files-error-report' into maint | Junio C Hamano | 2011-09-23 | 1 | -3/+3 |
| |\ \ \ | |||||
* | | | | | clone: print advice on checking out detached HEAD | Nguyễn Thái Ngọc Duy | 2012-01-16 | 1 | -15/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'jc/checkout-m-twoway' | Junio C Hamano | 2011-12-19 | 1 | -24/+36 |
|\ \ \ \ | |||||
| * | | | | checkout_merged(): squelch false warning from some gcc | Junio C Hamano | 2011-12-15 | 1 | -1/+1 |
| * | | | | checkout -m: no need to insist on having all 3 stages | Junio C Hamano | 2011-12-06 | 1 | -24/+36 |
* | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-19 | 1 | -8/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Convert resolve_ref+xstrdup to new resolve_refdup function | Nguyễn Thái Ngọc Duy | 2011-12-13 | 1 | -8/+7 |
* | | | | | | Merge branch 'nd/ignore-might-be-precious' | Junio C Hamano | 2011-12-13 | 1 | -3/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignorend/ignore-might-be-precious | Nguyễn Thái Ngọc Duy | 2011-11-28 | 1 | -3/+8 |
| * | | | | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious | Junio C Hamano | 2011-11-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'jn/branch-move-to-self' | Junio C Hamano | 2011-12-13 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-self | Jonathan Nieder | 2011-11-28 | 1 | -4/+11 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'nd/resolve-ref' | Junio C Hamano | 2011-12-09 | 1 | -3/+5 |
|\ \ \ \ \ \ \ |