Re: Is there any way to "interrupt" a rebase?

2018-02-20 Thread Johannes Schindelin
Hi Hilco, On Mon, 19 Feb 2018, Hilco Wijbenga wrote: > On Mon, Feb 19, 2018 at 2:36 PM, brian m. carlson > wrote: > > On Mon, Feb 19, 2018 at 11:35:25AM -0800, Hilco Wijbenga wrote: > >> So a scenario like this: > >> > >> my-branch : X -> A -> B -> C -> D -> E -> F

Re: Git should preserve modification times at least on request

2018-02-20 Thread Johannes Schindelin
Hi Peter, On Mon, 19 Feb 2018, Peter Backes wrote: > On Mon, Feb 19, 2018 at 10:58:12PM +0100, Johannes Schindelin wrote: > > Since you already assessed that it shouldn't be hard to do, you > > probably want to put your money where your mouth is and come up with a > > patch, and then offer it up

Re: Why git-revert doesn't invoke the pre-commit and the commit-msg hooks?

2018-02-20 Thread Phillip Wood
Hi Gustavo On 19/02/18 14:50, Gustavo Chaves wrote: > > I asked this question on StackOverflow and got an answer: > https://stackoverflow.com/q/48852925/114983 > > The problem is that git-revert invokes git-commit with the -n flag, > explicitly avoiding the pre-commit and the commit-msg hooks.

Re: Is there any way to "interrupt" a rebase?

2018-02-20 Thread Phillip Wood
On 19/02/18 19:35, Hilco Wijbenga wrote: > > Hi all, > > When maintaining a long running branch, I regularly rebase onto our > active development branch so that my branch stays up-to-date. What > happens fairly often is that during such a rebase, Git will exit > because of rebase/merge

Re: [PATCH] Fix misconversion of gitsubmodule.txt

2018-02-20 Thread Eric Sunshine
On Tue, Feb 20, 2018 at 3:51 AM, marmot1123 wrote: > In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions > `submodule’s`. > It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. Thanks for the contribution. Please sign-off your patch; see

[PATCH] Fix misconversion of gitsubmodule.txt

2018-02-20 Thread marmot1123
In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions `submodule’s`. It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. --- Documentation/gitsubmodules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gitsubmodules.txt

<    1   2