Has this patch been released yet?
--
View this message in context:
http://git.661346.n2.nabble.com/first-parent-commit-graph-layout-and-pull-merge-direction-tp7586671p7602383.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe from this list: send the line unsubscribe
Eric Sunshine sunsh...@sunshineco.com writes:
+When `git pull` that does not explicitly specify what branch from
+which repository is to be integrated with your history on the
+command line, recent Git will refuse to work until you specify how
+that integration should happen, either with a
On Fri, Jul 19, 2013 at 12:22 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
+When `git pull` that does not explicitly specify what branch from
+which repository is to be integrated with your history on the
+command line, recent Git will refuse to
Eric Sunshine sunsh...@sunshineco.com writes:
Dropping the parenthetical comment might improve flow slightly:
Without repository or branch on the command line, `git pull`
needs to be told how to integrate the changes with your history,
via either `--merge` or `--rebase`.
With
On Fri, Jul 19, 2013 at 6:20 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
Dropping the parenthetical comment might improve flow slightly:
Without repository or branch on the command line, `git pull`
needs to be told how to integrate the
Eric Sunshine sunsh...@sunshineco.com writes:
With no repository or branch on the command line, `git pull` needs
to be told how to integrate the changes with your history.
This can be done via either `--merge` or `--rebase` option, but most
people would want to decide which
Because it is so easy to let Git handle automatically a trivial
merge with git pull, a person who is new to Git may not realize
that the project s/he is interacting with may prefer a rebase
workflow.
Add a safety valve to fail git pull that does not explicitly
specify what branch from which
On Thu, Jul 18, 2013 at 3:35 PM, Junio C Hamano gits...@pobox.com wrote:
Add a safety valve to fail git pull that does not explicitly
specify what branch from which repository to integrate your history
with, when it is neither a fast-forward or already up-to-date,
until/unless the user
8 matches
Mail list logo