summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2011-12-19Merge branch 'jc/checkout-m-twoway'Libravatar Junio C Hamano1-24/+36
2011-12-19Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-8/+7
2011-12-15checkout_merged(): squelch false warning from some gccLibravatar Junio C Hamano1-1/+1
2011-12-13Merge branch 'nd/ignore-might-be-precious'Libravatar Junio C Hamano1-3/+8
2011-12-13Merge branch 'jn/branch-move-to-self'Libravatar Junio C Hamano1-4/+11
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionLibravatar Nguyễn Thái Ngọc Duy1-8/+7
2011-12-09Merge branch 'nd/resolve-ref'Libravatar Junio C Hamano1-3/+5
2011-12-06checkout -m: no need to insist on having all 3 stagesLibravatar Junio C Hamano1-24/+36
2011-12-05Copy resolve_ref() return value for longer useLibravatar Nguyễn Thái Ngọc Duy1-1/+3
2011-12-05Merge branch 'nd/maint-ignore-exclude'Libravatar Junio C Hamano1-1/+1
2011-11-28Allow checkout -B <current-branch> to update the current branchLibravatar Jonathan Nieder1-4/+11
2011-11-28checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreLibravatar Nguyễn Thái Ngọc Duy1-3/+8
2011-11-28Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousLibravatar Junio C Hamano1-1/+1
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2011-10-17Merge branch 'jc/checkout-from-tree-keep-local-changes'Libravatar Junio C Hamano1-1/+5
2011-10-13Merge branch 'rs/pending'Libravatar Junio C Hamano1-28/+18
2011-10-10Merge branch 'mh/check-ref-format-3'Libravatar Junio C Hamano1-1/+1
2011-10-05Change check_ref_format() to take a flags argumentLibravatar Michael Haggerty1-1/+1
2011-10-05Merge branch 'jk/argv-array'Libravatar Junio C Hamano1-19/+8
2011-10-03commit: factor out clear_commit_marks_for_object_arrayLibravatar René Scharfe1-7/+1
2011-10-03checkout: use leak_pending flagLibravatar René Scharfe1-13/+12
2011-10-03checkout: use add_pending_{object,sha1} in orphan checkLibravatar René Scharfe1-27/+12
2011-09-30checkout $tree $path: do not clobber local changes in $path not in $treeLibravatar Junio C Hamano1-1/+5
2011-09-16Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano1-1/+2
2011-09-16branch --set-upstream: regression fixLibravatar Junio C Hamano1-1/+2
2011-09-14checkout: use argv_array APILibravatar Jeff King1-19/+8
2011-08-28Merge branch 'ci/forbid-unwanted-current-branch-update'Libravatar Junio C Hamano1-9/+3
2011-08-23Merge branch 'cb/maint-ls-files-error-report'Libravatar Junio C Hamano1-3/+3
2011-08-22Prevent force-updating of the current branchLibravatar Conrad Irwin1-9/+3
2011-08-16Merge branch 'jc/checkout-reflog-fix' into maintLibravatar Junio C Hamano1-2/+5
2011-08-11ls-files: fix pathspec display on errorLibravatar Clemens Buchacher1-3/+3
2011-08-01Merge branch 'jc/maint-1.7.3-checkout-describe' into maintLibravatar Junio C Hamano1-1/+1
2011-07-22Merge branch 'jc/checkout-reflog-fix'Libravatar Junio C Hamano1-2/+5
2011-07-06Merge commit 'v1.7.6' into jc/checkout-reflog-fixLibravatar Junio C Hamano1-0/+1093
2011-06-29Merge branch 'jc/maint-1.7.3-checkout-describe'Libravatar Junio C Hamano1-1/+1
2011-06-29Merge branch 'jc/advice-about-to-lose-commit'Libravatar Junio C Hamano1-10/+11
2011-06-05checkout -b <name>: correctly detect existing branchLibravatar Junio C Hamano1-1/+1
2011-05-31Merge branch 'jk/format-patch-am'Libravatar Junio C Hamano1-5/+2
2011-05-26pretty: add pp_commit_easy function for simple callersLibravatar Jeff King1-2/+1
2011-05-24checkout: make advice when reattaching the HEAD less loudLibravatar Junio C Hamano1-6/+9
2011-05-06Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-1/+4
2011-04-12i18n: mark checkout plural warning for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+15
2011-04-12i18n: mark checkout --detach messages for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-50/+54
2011-03-25Convert read_tree{,_recursive} to support struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+4
2011-03-20checkout: tweak detached-orphan warning formatLibravatar Jeff King1-1/+4
2011-03-20checkout: clear commit marks after detached-orphan checkLibravatar Jeff King1-0/+13
2011-03-15Merge branch 'jc/checkout-orphan-warning'Libravatar Junio C Hamano1-6/+95
2011-03-09i18n: git-checkout "Switched to a .. branch" messageLibravatar Ævar Arnfjörð Bjarmason1-6/+8