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