aboutsummaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-19
|\
| * checkout_merged(): squelch false warning from some gccJunio C Hamano2011-12-15
| * checkout -m: no need to insist on having all 3 stagesJunio C Hamano2011-12-06
* | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-19
|\ \
| * | Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy2011-12-13
* | | Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2011-12-13
|\ \ \
| * | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreNguyễn Thái Ngọc Duy2011-11-28
| * | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano2011-11-28
| |\ \ \
* | \ \ \ Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow checkout -B <current-branch> to update the current branchJonathan Nieder2011-11-28
| |/ / /
* | | | Merge branch 'nd/resolve-ref'Junio C Hamano2011-12-09
|\ \ \ \
| * | | | Copy resolve_ref() return value for longer useNguyễn Thái Ngọc Duy2011-12-05
| * | | | Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-13
| |/ / /
* | | | Merge branch 'nd/maint-ignore-exclude'Junio C Hamano2011-12-05
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | checkout,merge: loosen overwriting untracked file check based on info/excludeNguyễn Thái Ngọc Duy2011-11-28
* | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-17
|\ \ \
| * | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-30
* | | | Merge branch 'rs/pending'Junio C Hamano2011-10-13
|\ \ \ \
| * | | | commit: factor out clear_commit_marks_for_object_arrayRené Scharfe2011-10-03
| * | | | checkout: use leak_pending flagRené Scharfe2011-10-03
| * | | | checkout: use add_pending_{object,sha1} in orphan checkRené Scharfe2011-10-03
* | | | | Merge branch 'mh/check-ref-format-3'Junio C Hamano2011-10-10
|\ \ \ \ \
| * | | | | Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-05
* | | | | | Merge branch 'jk/argv-array'Junio C Hamano2011-10-05
|\ \ \ \ \ \
| * | | | | | checkout: use argv_array APIJeff King2011-09-14
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-09-16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | branch --set-upstream: regression fixJunio C Hamano2011-09-16
* | | | | | Merge branch 'ci/forbid-unwanted-current-branch-update'Junio C Hamano2011-08-28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Prevent force-updating of the current branchConrad Irwin2011-08-22
| * | | | | Merge branch 'jc/checkout-reflog-fix' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-01
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-23
|\ \ \ \ \ \ \
| * | | | | | | ls-files: fix pathspec display on errorClemens Buchacher2011-08-11
| |/ / / / / /
* | | | | | | Merge branch 'jc/checkout-reflog-fix'Junio C Hamano2011-07-22
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-06
| |/ / / / /
* | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-29
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-05
* | | | | | Merge branch 'jc/advice-about-to-lose-commit'Junio C Hamano2011-06-29
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | checkout: make advice when reattaching the HEAD less loudJunio C Hamano2011-05-24
* | | | | | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-31
|\ \ \ \ \ \
| * | | | | | pretty: add pp_commit_easy function for simple callersJeff King2011-05-26
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-06
|\ \ \ \ \ \
| * | | | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-25
| |/ / / / /
* | | | | | i18n: mark checkout plural warning for translationÆvar Arnfjörð Bjarmason2011-04-12
* | | | | | i18n: mark checkout --detach messages for translationÆvar Arnfjörð Bjarmason2011-04-12
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-01
|\ \ \ \ \
| * | | | | i18n: git-checkout "Switched to a .. branch" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | | | | i18n: git-checkout "HEAD is now at" messageÆvar Arnfjörð Bjarmason2011-03-09
| * | | | | i18n: git-checkout describe_detached_head messagesÆvar Arnfjörð Bjarmason2011-03-09
| * | | | | i18n: git-checkout: our/their version messageÆvar Arnfjörð Bjarmason2011-03-09