Smartgit fast forward rebase
This helps heuristics based on the number of loose objects Loose unreachable objects to a pack instead of leaving them loose. * "git repack" learned the "-keep-unreachable" option, which sends (merge d9925d1 ew/mboxrd-format-am later to maint). ">", so that these lines can be restored to their original shape. Happens to begin with "From " in the e-mail message is quoted with * Teach format-patch and mailsplit (hence "am") how a line that (merge b738396 jk/upload-pack-hook later to maint). Responding to "fetch/clone" via the uploadpack.packObjectsHook. * "upload-pack" allows a custom "git pack-objects" replacement when * "git add -i/-p" learned to honor pactionHeuristicĮxperimental knob, so that the user can work on the same hunk split That they are shown with "remote: " prefix to avoid confusing the Receiving end are now passed back to the sending end in such a way * Messages that are generated by auto gc during "git push" on the * The completion script (in contrib/) learned to complete "git
Smartgit fast forward rebase update#
* Update the funcname definition to support css files. * "git worktree add" learned that '-' can be used as a short-hand the previous branch. * An upstream project can make a recommendation to shallowly clone That "-verify-signature" is a no-op when rebasing. * "git pull -rebase -verify-signature" learned to warn the user SZEDER Gábor, Thomas Braun, Torsten Bögershausen, Vasco Ramsay Jones, René Scharfe, Ronald Wampler, Stefan Beller, Nicolas Pitre, Orgad Shaneh, Patrick Steinhardt, Pranit Bauva, Michael J Gruber, Mike Hommey, Nguyễn Thái Ngọc Duy, Lukas Fleischer, Matthieu Moy, Mehul Jain, Michael Haggerty, Junio C Hamano, Lars Schneider, Lars Vogel, Linus Torvalds, Johannes Sixt, John Keeping, Jonathan Nieder, Josh Triplett, Jean-Noel Avila, Jeff King, Joey Hess, Johannes Schindelin, Greene,ĭavid Aguilar, David Kastrup, David Turner, Edward Thomson,Įlia Pinto, Eric Sunshine, Eric Wong, Heiko Voigt, Jacob Keller, carlson,Ĭharles Bailey, Chris Packham, Christian Couder, David A. Returning contributors who helped this release are as follows.Īlex Henrie, Alfred Perlstein, Armin Kunaschik, brian m. Michael Stahl, Parker Moore, Peter Colberg, Tom Russello, Josef Kufner, Keith McGuigan, Kevin Willford, LE Manh Cuong, Maste, Heiko Becker, Ingo Brückl, Jonathan Tan, Jordan DE GEA, Welcome to the Git development community!Īlexander Hirsch, Andreas Brauchli, Andrew Oakley, Antoine Queru,īen Wijen, Christopher Layne, Dave Nicolson, David Glasser, Ed New contributors whose contributions weren't in v2.9.0 are as follows. 'v2.10.0-rc2' tag and the 'master' branch that the tag points at:
The following public repositories all have a copy of the
Since v2.9.0, contributed by 71 people, 22 of which are new faces.
Smartgit fast forward rebase archive#
No, that is called rebasing, of which fast-forwarding is a special case when there are no commits to be replayed (and the target branch has new commits, and the history of the target branch has not been rewritten, so that all the commits on the target branch have the current one as their ancestor.Git v2.10.0-rc2 archive mirror help / color / mirror / Atom feed * Git v2.10.0-rc2 22:31 Junio C Hamano 0 siblings, 0 replies only message in threadįrom: Junio C Hamano 22:31 UTC ( / raw)Ī release candidate Git v2.10.0-rc2 is now available for testingĪt the usual places. Is it ok to assume that fast-forward means all commits are replayed on the target branch and the HEAD is set to the last commit on that branch? Usually, no special steps are needed to do fast-forwarding it is done by merge or rebase in the situation when there are no local commits. If your local master has no changes, then it can be fast-forwarded: simply updated to point to the same commit as the latest origin/master.
The situation requires a rebase or merge. To simply reset master to the value of origin/master would discard your local commits. The branch now diverges from its upstream and cannot be fast forwarded: your master HEAD commit is not an ancestor of origin/master HEAD. For instance, you are on master and have local commits, and git fetch has brought new upstream commits into origin/master. įast forwarding is not possible when the new HEAD is in a diverged state relative to the stream you want to integrate. In other words, the prior value is a parent, or grandparent, or grandgrandparent. In Git, to "fast forward" means to update the HEAD pointer in such a way that its new value is a direct descendant of the prior value.