Junio C Hamano 5a4d707a6d 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		2008-02-27 12:53:26 -08:00
..
git-checkout.sh	Merge branch 'db/checkout'	2008-02-27 12:53:26 -08:00
git-clean.sh
git-commit.sh
git-fetch.sh
git-gc.sh
git-ls-remote.sh
git-merge-ours.sh
git-reset.sh
git-resolve.sh
git-revert.sh	contrib: resurrect scripted git-revert.	2007-12-26 17:38:00 -08:00
git-svnimport.perl
git-svnimport.txt
git-tag.sh	Officially deprecate repo-config.	2008-01-17 22:52:40 -08:00
git-verify-tag.sh