git/git-checkout.sh, branch v1.2.2

More useful/hinting error messages in git-checkout

2006-02-16T03:14:04Z

Signed-off-by: Josef Weidendorfer Signed-off-by: Junio C Hamano

checkout: fix dirty-file display.

2006-02-15T00:05:57Z

When we refused to switch branches, we incorrectly showed differences from the branch we would have switched to. Signed-off-by: Junio C Hamano

git-commit: show dirtiness including index.

2006-02-12T21:05:53Z

Earlier, when we switched a branch we used diff-files to show paths that are dirty in the working tree. But we allow switching branches with updated index ("read-tree -m -u $old $new" works that way), and only showing paths that have differences in the working tree but not paths that are different in index was confusing. This shows both as modified from the top commit of the branch we just have switched to. Signed-off-by: Junio C Hamano

[PATCH] checkout: show dirty state upon switching branches.

2006-01-14T21:18:28Z

This shows your working file state when you switch branches. As a side effect, "git checkout" without any branch name (i.e. stay on the current branch) becomes a more concise shorthand for the "git status" command. Signed-off-by: Junio C Hamano

checkout: merge local modifications while switching branches.

2006-01-14T00:52:37Z

* Instead of going interactive, introduce a command line switch '-m' to allow merging changes when normal two-way merge by read-tree prevents branch switching. * Leave the unmerged stages intact if automerge fails, but reset index entries of cleanly merged paths to that of the new branch, so that "git diff" (not "git diff HEAD") would show the local modifications. * Swap the order of trees in read-tree three-way merge used in the fallback, so that `git diff` to show the conflicts become more natural. * Describe the new option and give more examples in the documentation. Signed-off-by: Junio C Hamano

checkout: automerge local changes while switching branches.

2006-01-14T00:52:37Z

When switching branches, if the working tree has a local modification at paths that are different between current and new branches, we refused the operation saying "cannot merge." This attempts to do an automerge for such paths. This is still experimental. Signed-off-by: Junio C Hamano

Adjust to ls-tree --full-name when run from a subdirectory.

2005-12-23T22:10:16Z

A proposed change to show cwd relative paths by default from ls-tree when run from a subdirectory means we would need to give --full-name option to it. Signed-off-by: Junio C Hamano

checkout: sometimes work from a subdirectory.

2005-12-23T07:16:55Z

git-checkout does two very different things, and what they should do when run from subdirectory are quite different. It does not make any sense to run the one that switches the current head from anywhere other than the toplevel: git-checkout [-f] git-checkout [-b ] We could of course chdir to top and do the whole-tree checkout in git-checkout, but the point is the operation does not make sense on a partial tree. The whole tree is checked out. The other form is to update the index file and working tree file selectively: git-checkout ... ;# out of tree to index and file git-checkout -- ... ;# out of index to file This form _does_ make sense to run from subdirectory; and I myself often wish we supported this. So here is a patch to do both. Signed-off-by: Junio C Hamano

Comment fixes.

2005-12-17T07:32:47Z

Signed-off-by: Junio C Hamano

Trivial usage string clean-up

2005-12-14T10:53:43Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano