aboutsummaryrefslogtreecommitdiff
path: root/builtin-checkout.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\
| * checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-31
| * checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-30
| * checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-30
| * checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-30
* | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\ \
| * | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-30
* | | Merge branch 'maint'Shawn O. Pearce2008-09-25
|\ \ \
| * | | checkout: Do not show local changes when in quiet modeJonas Fonseca2008-09-25
* | | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-21
|\ \ \ \
| * | | | Check early that a new branch is new and validDaniel Barkalow2008-09-21
| |/ / /
| * | | Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-18
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-checkout-fix' into maintJunio C Hamano2008-09-10
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'jc/maint-checkout-keep-remove'Junio C Hamano2008-09-16
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | checkout: do not lose staged removalJunio C Hamano2008-09-09
| |/ / /
* | | | Merge branch 'jc/maint-checkout-fix'Junio C Hamano2008-09-07
|\ \ \ \ | | |/ / | |/| |
| * | | checkout: do not check out unmerged higher stages randomlyJunio C Hamano2008-08-30
* | | | Merge branch 'maint'Junio C Hamano2008-09-03
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | checkout: fix message when leaving detached HEADJeff King2008-09-03
| |/
* | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-22
* | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-11
|/
* git-checkout: improve error messages, detect ambiguities.Pierre Habouzit2008-07-24
* Merge branch 'maint' into ph/checkoutJunio C Hamano2008-07-23
|\
| * git-checkout: fix command line parsing.Pierre Habouzit2008-07-23
* | add context pointer to read_tree_recursive()René Scharfe2008-07-15
* | Refactor "tracking statistics" code used by "git checkout"Junio C Hamano2008-07-02
|/
* checkout: "best effort" checkoutJunio C Hamano2008-05-29
* checkout: consolidate reset_{to_new,clean_to_new}()Junio C Hamano2008-05-29
* checkout: make reset_clean_to_new() not die by itselfJunio C Hamano2008-05-28
* "git checkout -- paths..." should error out when paths cannot be writtenJunio C Hamano2008-05-28
* Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-25
|\
| * Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* | Merge branch 'jc/unpack-trees-reword'Junio C Hamano2008-05-25
|\ \
| * | unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-19
| |/
* | Extend interface of add_files_to_cache to allow ignore indexing errorsAlex Riesen2008-05-12
|/
* Merge branch 'maint'Junio C Hamano2008-05-03
|\
| * checkout: don't rfc2047-encode oneline on detached HEADJeff King2008-05-03
* | git checkout: add -t alias for --trackMiklos Vajna2008-04-27
|/
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-09
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-09
* cleanup: remove unused git_checkout_configDenis Cheng2008-03-02
* Write index file on any checkout of filesDaniel Barkalow2008-02-29
* Fix builtin checkout crashing when given an invalid pathAlex Riesen2008-02-29
* Merge branch 'js/branch-track'Junio C Hamano2008-02-27
|\
| * branch: optionally setup branch.*.merge from upstream local branchesJay Soffian2008-02-19
* | checkout: error out when index is unmerged even with -mJunio C Hamano2008-02-24
* | checkout: show progress when checkout takes long time while switching branchesJunio C Hamano2008-02-23
* | checkout: updates to tracking reportJunio C Hamano2008-02-21
* | builtin-checkout.c: Remove unused prefix arguments in switch_branches pathDaniel Barkalow2008-02-21
* | checkout: work from a subdirectoryJunio C Hamano2008-02-20
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-26 05:36:28 +0000