A Donation Of 1 Million British Pounds To You In Good Faith
A donation of 1 million British Pounds to you in good faith
A Donation Of 1 Million Pounds To You In Good Faith
--mandir=/dev/null still results in the pages being installed
in their usual location (at least in combination with setting --prefix to
avoid disturbing my production git installation).
Regards,
Neil
Eine Spende von 1 Million Britische Pfund zu Ihnen in gutem Glauben
Hi,
the following git-bisect log - applied to a recent linux-kernel tree
produced different end results when I use "git bisect replay"
and when I just run it as a shell script.
$ git bisect replay /tmp/log
We are not bisecting.
Bisecting: a merge base must be tested
[2decb2682f80759f631c8332f
On Sun, May 18, 2014 at 11:28:39PM +0300, Michael S. Tsirkin wrote:
> There's some special code in rebase -i to deal
> with --keep-empty.
> Add test for this combination.
>
> Signed-off-by: Michael S. Tsirkin
Acked-by: Neil Horman
> ---
> t/t3404-rebase-interactive.
On Tue, May 28, 2013 at 09:32:59PM -0500, Felipe Contreras wrote:
> Junio C Hamano wrote:
> > Neil Horman writes:
> >
> > > On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote:
> > >> We should free objects before leaving.
> >
};
I like the idea, but this option seems a bit awkward to me. At the very least
here, don't you now need to check for conflicts if --keep-redundant-commits and
skip-empty are both specified (as iirc git doens't see the difference between
empty commits and commits made empty b
res = run_git_commit(defmsg, opts, allow);
> }
>
> +leave:
> free_message(&msg);
> free(defmsg);
>
> --
> 1.8.3.rc3.312.g47657de
>
>
Acked-by: Neil Horman
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 02, 2013 at 03:06:51PM -0400, Neil Horman wrote:
> On Tue, Apr 02, 2013 at 11:06:28AM -0700, Junio C Hamano wrote:
> > Neil Horman writes:
> >
> > > I've recently started looking into the possibility of having git support
> > > multiple in-prog
On Tue, Apr 02, 2013 at 11:06:28AM -0700, Junio C Hamano wrote:
> Neil Horman writes:
>
> > I've recently started looking into the possibility of having git support
> > multiple in-progress sequencers, and wanted to solicit opinions for how
> > best to
> >
head mode, if thats useful).
So, before I went implementing, I wanted to solicit opinions here. Does anyone
have any thoughts (including completely different directions to move in for this
feature)?
Thanks!
Neil
--
To unsubscribe from this list: send the line "unsubscribe git" i
st $merges_option --pretty=oneline
> --abbrev-commit \
> while read -r shortsha1 rest
> do
>
> - if test -z "$keep_empty" && is_empty_commit $shortsha1
> + if test -z "$keep_empty" && is_empty_commit $shortsha1 && !
> is_merge
(Not sure if you guys are using Google Code's Issue Tracker; if so, I
originally filed this here:
https://code.google.com/p/git-core/issues/detail?id=18 )
What steps will reproduce the problem?
1. Build git from source.
2. Download git-manpages-*.
3. Install both.
4. Attempt to build and install c
igned-off-by: Martin von Zweigbergk
Acked-by: Neil Horman
> ---
>
> Added another test for when the upstream already has an empty
> commit. The test case protects the current behavior; I just assume the
> current behavior is what we want.
>
> While writing the test case, I als
mp;
> - test $(git log --format=%s C..) = "D"
> + test "$(git log --format=%s C..)" = "D"
> +'
> +
> +test_expect_success 'rebase --keep-empty' '
> + git reset --hard D &&
> + git rebase --keep-empty C &&
On Mon, Aug 06, 2012 at 12:00:16PM +0100, Chris Webb wrote:
> Neil Horman writes:
>
> > Having read over this thread, I think this is definately the way to go. As
> > discussed having cherry-pick stop and give the user a chance to fix empty
> > history messages by
ing cherry-pick stop and give the user a chance to fix empty
history messages by default, and providing a switch to override that behavior
makes sense to me. That said, shouldn't there be extra code here in the rebase
scripts to automate commit migration in that path as well?
Neil
>
--
To
as soon as I'm back next week
Neil
> > $ git cherry-pick 59a8fde
> > Aborting commit due to empty commit message.
>
> > I can see that this check could make sense when the message has been
> > modified, but it seems strange when it hasn't, and isn't
rtsha1 "$rest"
> else
> sha1=$(git rev-parse $shortsha1)
> if test -z "$rebase_root"
> @@ -863,7 +866,7 @@ do
> if test f = "$preserve"
> then
> touch "$rewritten"/$
On Wed, Jul 18, 2012 at 09:10:06AM +0200, Johannes Sixt wrote:
> Am 7/18/2012 8:20, schrieb Martin von Zweigbergk:
> > On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman wrote:
> >> pick_one () {
> >> ff=--ff
> >> +
> >> case &
22 matches
Mail list logo
