diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 12:53:26 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 12:53:26 -0800 |
commit | 5a4d707a6d914fcea302e299fc18892d9e42c767 (patch) | |
tree | bcca033e39a540aea39acdcb98ef772631fdbc3b /pkt-line.c | |
parent | 992221d05e42ad9f65a88318ca6339aa1c39fc79 (diff) | |
parent | 04c9e11f2cffaf84dd20602f811bf377f6033cb6 (diff) | |
download | git-5a4d707a6d914fcea302e299fc18892d9e42c767.tar.gz git-5a4d707a6d914fcea302e299fc18892d9e42c767.tar.xz |
Merge branch 'db/checkout'
* db/checkout: (21 commits)
checkout: error out when index is unmerged even with -m
checkout: show progress when checkout takes long time while switching branches
Add merge-subtree back
checkout: updates to tracking report
builtin-checkout.c: Remove unused prefix arguments in switch_branches path
checkout: work from a subdirectory
checkout: tone down the "forked status" diagnostic messages
Clean up reporting differences on branch switch
builtin-checkout.c: fix possible usage segfault
checkout: notice when the switched branch is behind or forked
Build in checkout
Move code to clean up after a branch change to branch.c
Library function to check for unmerged index entries
Use diff -u instead of diff in t7201
Move create_branch into a library file
Build-in merge-recursive
Add "skip_unmerged" option to unpack_trees.
Discard "deleted" cache entries after using them to update the working tree
Send unpack-trees debugging output to stderr
Add flag to make unpack_trees() not print errors.
...
Conflicts:
Makefile
Diffstat (limited to 'pkt-line.c')
0 files changed, 0 insertions, 0 deletions