diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 12:43:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 12:43:00 -0700 |
commit | d7ed4041c8468a2ca93f1c8ac511af9d895d3d6d (patch) | |
tree | f209ad1e994b76de43073839fe78c6d431f60e02 /git-checkout.txt | |
parent | 2ce0aac108b9c935f3ac01e98478120df1f52ce1 (diff) | |
download | git-htmldocs-d7ed4041c8468a2ca93f1c8ac511af9d895d3d6d.tar.gz |
Autogenerated HTML docs for v2.5.0-234-gefc8a
Diffstat (limited to 'git-checkout.txt')
-rw-r--r-- | git-checkout.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 63b739c55..e269fb110 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -120,6 +120,21 @@ entries; instead, unmerged entries are ignored. --theirs:: When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths. ++ +Note that during `git rebase` and `git pull --rebase`, 'ours' and +'theirs' may appear swapped; `--ours` gives the version from the +branch the changes are rebased onto, while `--theirs` gives the +version from the branch that holds your work that is being rebased. ++ +This is because `rebase` is used in a workflow that treats the +history at the remote as the shared canonical one, and treats the +work done on the branch you are rebasing as the third-party work to +be integrated, and you are temporarily assuming the role of the +keeper of the canonical history during the rebase. As the keeper of +the canonical history, you need to view the history from the remote +as `ours` (i.e. "our shared canonical history"), while what you did +on your side branch as `theirs` (i.e. "one contributor's work on top +of it"). -b <new_branch>:: Create a new branch named <new_branch> and start it at |