Am 12.11.2014 22:59, schrieb Jeff King:
On Wed, Nov 12, 2014 at 09:20:22PM +0100, Johannes Sixt wrote:
Am 09.11.2014 um 02:59 schrieb Jeff King:
test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
- test_when_finished "git branch -d a || git branch -d a/b" &&
+
On Thu, Nov 13, 2014 at 09:50:24AM +0100, Johannes Sixt wrote:
> >That looks more like it is failing the actual test (i.e., the creation
> >of branch "one" when there is cruft in the reflog). My guess is that
> >calling open() on a directory is giving us EACCES instead of EISDIR. Can
> >you verify
On Thu, Nov 13, 2014 at 08:36:07AM +0100, Torsten Bögershausen wrote:
> A URL like file;//. is (no longer) supported by Git:
> Typically there is no host, and RFC1738 says that file:///
> should be used.
>
> Update t5705 to use a working URL.
Interesting. This looks like it was unintentionally l
On Thu, Nov 13, 2014 at 11:27:06AM +1100, Colin Smith wrote:
> Apologies if this has already been raised or PEBCAK, but I've noticed
> a bug where git log with certain date ranges breaks things. It appears
> to be any --since date with a --until date in the future between
> 2014-12-01 and 2014-12-
Hi Junio,
On Wed, 12 Nov 2014, Junio C Hamano wrote:
> Instead of running "update-index --refresh; read-tree -m -u", using
> "reset --keep" may be a better implementation of what you are trying to
> do here.
I do not think that `reset --keep` is what I want. I really want to update
only if the w
Hi Junio,
On Thu, 13 Nov 2014, Johannes Schindelin wrote:
> Due to that experience, the documentation also states pretty clearly that
> `updateInstead` succeeds only in updating the current branch if the
> working directory is clean.
To clarify why `updateInstead` is stricter than the `merge` sc
From: Stefan Naewe
'git status' doesn't output leading '#'s these days.
Signed-off-by: Stefan Naewe
---
Documentation/gittutorial-2.txt | 23 ---
Documentation/gittutorial.txt | 17 +
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/Documen
Hello all,
i just got git from master (f6f61cbbad0611e03b712cc354f1665b5d7b087e),
built and installed it successfully, now i'm running make test and got
following error:
*** t9902-completion.sh ***
t9902-completion.sh: 118:
/home/shk/dev/git/t/../contrib/completion/git-completion.bash: Syntax
er
This patch series adds support for a new receive.denyCurrentBranch setting
to update the working directory (which must be clean, i.e. there must not be
any uncommitted changes) when pushing into the current branch.
The scenario in which the 'updateInstead' setting became a boon in this
developer's
When synchronizing between working directories, it can be handy to update
the current branch via 'push' rather than 'pull', e.g. when pushing a fix
from inside a VM, or when pushing a fix made on a user's machine (where
the developer is not at liberty to install an ssh daemon let alone know
the use
On Thu, Nov 13, 2014 at 04:36:06AM -0500, Jeff King wrote:
> On Thu, Nov 13, 2014 at 11:27:06AM +1100, Colin Smith wrote:
>
> > Apologies if this has already been raised or PEBCAK, but I've noticed
> > a bug where git log with certain date ranges breaks things. It appears
> > to be any --since da
The approxidate functions accept an extra "now" parameter to
avoid calling time() themselves. We use this in our test
suite to make sure we have a consistent time for computing
relative dates. However, deep in the bowels of approxidate,
we also call time() to check whether possible dates are far
in
When we are parsing approxidate strings and we find three
numbers separate by one of ":/-.", we guess that it may be a
date. We feed the numbers to match_multi_number, which
checks whether it makes sense as a date in various orderings
(e.g., dd/mm/yy or mm/dd/yy, etc).
One of the checks we do is t
How can I reduce the disk usage for multiple copies of the same repo?
Up to now I just made copies like this, but since .git alone is already
2GB it becomes expensive:
# git clone git://host/repo.git repo-master
# cp -a repo-master repo-branchA
# cd repo-branchA
# git checkout -b branchA ori
On Thu, Nov 13, 2014 at 04:59:12PM +0600, Alex Kuleshov wrote:
> i just got git from master (f6f61cbbad0611e03b712cc354f1665b5d7b087e),
> built and installed it successfully, now i'm running make test and got
> following error:
>
> *** t9902-completion.sh ***
> t9902-completion.sh: 118:
> /home/s
Hello Jeff,
I'm using ubuntu 14.04 x86_64 and bash GNU bash, version
4.3.11(1)-release (x86_64-pc-linux-gnu).
I didn't applied any patches to bash for all time since i installed
system. so it reall weird
Jeff King @ 2014-11-13 17:24 ALMT:
> On Thu, Nov 13, 2014 at 04:59:12PM +0600, Alex Kule
Junio, thanks for reviewing.
On Wed, Nov 12, 2014 at 10:25:14AM -0800, Junio C Hamano wrote:
> "When I say addresses on Cc: does not matter, it doesn't. No matter
> what the address in question is" (likewise for S-o-b:) is what the
> updated logic says. It is easier to explain than the tradition
On Thu, Nov 13, 2014 at 12:14:44PM +0100, Olaf Hering wrote:
>
> How can I reduce the disk usage for multiple copies of the same repo?
You can use --local och --shared. As you say --shared can be dangerous.
If you don't understand the man page enough to know how you should
manage your clones you
On Thu, Nov 13, Fredrik Gustafsson wrote:
> On Thu, Nov 13, 2014 at 12:14:44PM +0100, Olaf Hering wrote:
> >
> > How can I reduce the disk usage for multiple copies of the same repo?
>
> You can use --local och --shared. As you say --shared can be dangerous.
> If you don't understand the man pag
On Thu, Nov 13, 2014 at 6:14 PM, Olaf Hering wrote:
> Since each .git is almost identical I wonder if there is a reliable way
> to "share" it. The "git clone" man page mentions --shared as a dangerous
> way to do things. It does not give an advice how to manage such cloned
> trees.
If you know wh
On Thu, Nov 13, Roger Gammans wrote:
> Note the first sentence of the second paragraph.
> eg:
> # git clone git://host/repo.git repo-master
> # git clone repo-master repo-branchA
> # cd repo-branchA
> # git checkout -b branchA origin/branchA
It fails right here because in this dir only "mast
On Thu, Nov 13, 2014 at 12:05 PM, Torsten Bögershausen wrote:
> From a Git user perspective it could be good to have something like this:
>
> a) git status -u
> b) git status -uno
> c) git status -umtime
> d) git status -uwatchman
>
> We know that a) and b) already exist.
> c) Can be convenient to
On Thu, 2014-11-13 at 12:14 +0100, Olaf Hering wrote:
> How can I reduce the disk usage for multiple copies of the same repo?
>
> Up to now I just made copies like this, but since .git alone is already
> 2GB it becomes expensive:
>
> # git clone git://host/repo.git repo-master
> # cp -a repo-ma
Hi,
I've strung together the following git alias command for our company.
This command allows us to create a deployment package (archive) for a
specific feature. The archive will contain only the files that changed
during the development of that feature. We then deploy that archive to
our cli
Graeme Geldenhuys:
This works very well. The only problem we have so far is that if we have
files with spaces in the name (eg: SQL update scripts), then the command
breaks.
If you add -z to the git diff command-line, it will give you the names
with nul terminators instead. If you couple that
On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote:
> [alias]
> deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD
> $(git diff --name-only -D $2)' -
>
> This works very well. The only problem we have so far is that if we
> have files with spaces in the name (eg:
On Thu, Nov 13, 2014 at 05:34:50PM +0600, Alex Kuleshov wrote:
> I'm using ubuntu 14.04 x86_64 and bash GNU bash, version
> 4.3.11(1)-release (x86_64-pc-linux-gnu).
>
> I didn't applied any patches to bash for all time since i installed
> system. so it reall weird
I tried on a fresh install of U
When object is replaced with itself git shows unhelpful messages like(git log):
"fatal: replace depth too high for object "
Prevents user from replacing object with itself(with test for checking
this case).
Signed-off-by: Manzur Mukhitdinov
---
builtin/replace.c | 8 +++-
t/t6050-repl
On Thu, Nov 13, Olaf Hering wrote:
> So how can I reduce the disk usage needed for the four .git dirs above?
> I looked around in the docs that came with my git-2.1.3 package, but
> found nothing that answers my question. Maybe we can workout something
> and add it to one of the existing docs.
W
Thanks for sharing your notes! A few comments:
On Thu, Nov 13, 2014 at 04:44:57PM +0100, Olaf Hering wrote:
> First clone the remote repository as usual. Then create a local branch for
> each remote branch that is supposed to be worked on:
> # git clone git://host/repo.git repo-master
> # cd repo-
On Thu, Nov 13, 2014 at 5:03 PM, Fredrik Gustafsson wrote:
> Thanks for sharing your notes! A few comments:
>
> On Thu, Nov 13, 2014 at 04:44:57PM +0100, Olaf Hering wrote:
>> First clone the remote repository as usual. Then create a local branch for
>> each remote branch that is supposed to be wo
If your servers run a Unix and you can install Git on the servers than you
might want to try the install script we use in our company:
https://github.com/comsolit/comsolit_deploy
There's a bare git repository on the server and a post-receive hook that
exports the content of the git repository i
Jeff King writes:
> The patch you are responding to is a fix-up for 9233887, which tweaked
> the code and added those tests in the first place (I doubt it would work
> for you, though, as it has a problem on case-insensitive filesystems).
>
>> But the sequence works as expected with a version bui
Jeff King writes:
> On Thu, Nov 13, 2014 at 08:36:07AM +0100, Torsten Bögershausen wrote:
>
>> A URL like file;//. is (no longer) supported by Git:
>> Typically there is no host, and RFC1738 says that file:///
>> should be used.
>>
>> Update t5705 to use a working URL.
>
> Interesting. This look
writes:
> From: Stefan Naewe
>
> 'git status' doesn't output leading '#'s these days.
>
> Signed-off-by: Stefan Naewe
> ---
Thanks, will queue.
> Documentation/gittutorial-2.txt | 23 ---
> Documentation/gittutorial.txt | 17 +
> 2 files changed, 21 inse
Duy Nguyen writes:
> On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote:
>> [alias]
>> deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD
>> $(git diff --name-only -D $2)' -
>>
>> This works very well. The only problem we have so far is that if we
>> have files
Johannes Schindelin writes:
> On Thu, 13 Nov 2014, Johannes Schindelin wrote:
>
>> Due to that experience, the documentation also states pretty clearly that
>> `updateInstead` succeeds only in updating the current branch if the
>> working directory is clean.
>
> To clarify why `updateInstead` is
Johannes Schindelin writes:
> On Thu, 13 Nov 2014, Johannes Schindelin wrote:
>
>> Due to that experience, the documentation also states pretty clearly that
>> `updateInstead` succeeds only in updating the current branch if the
>> working directory is clean.
>
> To clarify why `updateInstead` is
Johannes Schindelin writes:
> This patch series adds support for a new receive.denyCurrentBranch setting
> to update the working directory (which must be clean, i.e. there must not be
> any uncommitted changes) when pushing into the current branch.
>
> The scenario in which the 'updateInstead' se
Johannes Schindelin writes:
> diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
> index f4da20a..ba002a9 100755
> --- a/t/t5516-fetch-push.sh
> +++ b/t/t5516-fetch-push.sh
> @@ -1330,4 +1330,21 @@ test_expect_success 'fetch into bare respects
> core.logallrefupdates' '
> )
> '
>
slavomir vlcek writes:
> Hi,
> found a small code redundancy in a builtin command retrieval ('git.c').
>
> For the "master" branch.
>
> Thanks in advance for any suggestions.
>
> Signed-off-by: slavomir vlcek
> ---
Thanks. Please do realize that all of the above before the
three-dash line and
slavomir vlcek writes:
> The 'SubmittingPatches' document contains a small inconsistency
> in a patch-email sending procedure.
>
> Not a big thing,
> but a newcomer could get confused.
>
> Please,
> also consider adding the definition/explanation for all the branches available
> at the beginning
Junio C Hamano writes:
>> Signed-off-by: slavomir vlcek
> The same comment applies to the log message part.
I said:
> Will queue; no need to resend.
>
> Thanks.
But one thing to make sure. Do you really mean to have your
sign-off with all lowercase? I can amend the patch to read
Signe
On Sun, Nov 09, 2014 at 09:21:49AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Fri, Nov 07, 2014 at 11:35:59PM -0800, Junio C Hamano wrote:
> >
> >> I think that has direct linkage; what you have in mind I think is
> >> http://thread.gmane.org/gmane.comp.version-control.git/234903/
Junio C Hamano writes:
> Junio C Hamano writes:
>
>>> Signed-off-by: slavomir vlcek
>
>> The same comment applies to the log message part.
>
> I said:
>
>> Will queue; no need to resend.
>>
>> Thanks.
>
> But one thing to make sure. Do you really mean to have your
> sign-off with all lowercase
ah, i catched the problem, I launched make test with sudo and now all
tests passed successfully.
Jeff King @ 2014-11-13 17:24 ALMT:
> On Thu, Nov 13, 2014 at 04:59:12PM +0600, Alex Kuleshov wrote:
>
>> i just got git from master (f6f61cbbad0611e03b712cc354f1665b5d7b087e),
>> built and installed
Hi Junio,
On Thu, 13 Nov 2014, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Thu, 13 Nov 2014, Johannes Schindelin wrote:
> >
> >> Due to that experience, the documentation also states pretty clearly that
> >> `updateInstead` succeeds only in updating the current branch if the
>
Junio C Hamano writes:
>> -static const char *merge_worktree(unsigned char *sha1)
>> +static const char *update_worktree(unsigned char *sha1)
>> {
>> const char *update_refresh[] = {
>> "update-index", "--ignore-submodules", "--refresh", NULL
>> };
>> +const char *diff
Jeff King writes:
> On Sun, Nov 09, 2014 at 09:21:49AM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > On Fri, Nov 07, 2014 at 11:35:59PM -0800, Junio C Hamano wrote:
>> >
>> >> I think that has direct linkage; what you have in mind I think is
>> >> http://thread.gmane.org/gmane.com
From: Paul Smith
Date: Thu, 13 Nov 2014 14:01:34 -0500
Subject: [PATCH] git-new-workdir: Add -f to force new-workdir in existing
directory.
Signed-off-by: Paul Smith
---
I have an environment I want to use new-workdir for, where the directory
I need to use is pre-created for me and I'm dropped
Hi Junio,
On Thu, 13 Nov 2014, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > This patch series adds support for a new receive.denyCurrentBranch setting
> > to update the working directory (which must be clean, i.e. there must not be
> > any uncommitted changes) when pushing into the
Hi Junio,
On Thu, 13 Nov 2014, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
> > index f4da20a..ba002a9 100755
> > --- a/t/t5516-fetch-push.sh
> > +++ b/t/t5516-fetch-push.sh
> > @@ -1330,4 +1330,21 @@ test_expect_success 'f
On Thu, Nov 13, 2014 at 11:15:27AM -0800, Junio C Hamano wrote:
> > diff --git a/builtin/checkout.c b/builtin/checkout.c
> > index 5410dac..67cab4e 100644
> > --- a/builtin/checkout.c
> > +++ b/builtin/checkout.c
> > @@ -65,21 +65,40 @@ static int post_checkout_hook(struct commit *old,
> > struct
Johannes Schindelin writes:
> Thanks for mentioning this. I would like to ask not to loosen this later.
> Let me try to explain in more detail than before why I think it would make
> *my* life hard if it ever were loosened.
> ...
> And now when I try to push, Git complains that the working direct
On Thu, Nov 13, 2014 at 02:26:55PM -0500, Jeff King wrote:
> > Makes sense, including the use of strbuf (otherwise you would
> > allocate ce and then discard when it turns out that it is not
> > needed, which is probably with the same allocation pressure, but
> > looks uglier).
>
> Exactly. Const
On Thu, Nov 13, 2014 at 08:36:16PM +0700, Duy Nguyen wrote:
> On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote:
> > [alias]
> > deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD
> > $(git diff --name-only -D $2)' -
> >
> > This works very well. The only problem
On Thu, Nov 13, 2014 at 05:08:19PM +0100, Johan Herland wrote:
> Can you not do this much simpler with --reference? Like this:
>
> $ git clone --bare git://host/repo.git repo-master
> $ git clone -b branchA --reference repo-master git://host/repo.git
> repo-branchA
> $ git clone -b branchB
On Wed, Nov 12, 2014 at 02:25:52PM -0800, Michael Blume wrote:
> From lib_terminal.sh:
>
> # Reading from the pty master seems to get stuck _sometimes_
> # on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
> #
> # Reproduction recipe: run
> #
> # i=0
> # while ./test-terminal.perl echo hi $i
> # do
Junio C Hamano writes:
> Thanks for an explanation why the updateInstead mode must require a
> pristine working tree (and the index). I *now* agree why such a
> mode would be useful, *after* reading it. I did not understand why
> *after* reading only the patch, the documentation updates and the
Jeff King writes:
> On Thu, Nov 13, 2014 at 08:36:16PM +0700, Duy Nguyen wrote:
>
>> On Thu, Nov 13, 2014 at 12:32:40PM +, Graeme Geldenhuys wrote:
>> > [alias]
>> > deploy = !sh -c 'git archive --prefix=$1/ -o deploy_$1.zip HEAD
>> > $(git diff --name-only -D $2)' -
>> >
>> > This work
On Thu, Nov 13, 2014 at 09:06:51PM +, Michael Blume wrote:
> Can do =)
>
> uname -r spits out "14.0.0". Is there anything in git's testing library for
> comparing version strings or should I roll my own?
No, there's nothing standard for comparing version numbers. Probably
test "$(uname
Jeff King writes:
> if (c != '.' &&
> - is_date(num3, num, num2, refuse_future, now, tm))
> + is_date(num3, num, num2, refuse_future, now, tm, 0))
> break;
Doesn't the new argument '0', which is "allow-future", look somewhat
str
Hello folks,
I have a patch for gitk. Should i send it to this list, or is there some
other? git/Documentation/SubmittingPatches mentions
git://ozlabs.org/~paulus/gitk (the master of which i based my commit
on), but never mentions any list(s) by name (only "the Git mailing
list", which i presume
Jeff King writes:
> On Thu, Nov 13, 2014 at 02:26:55PM -0500, Jeff King wrote:
>
>> > Makes sense, including the use of strbuf (otherwise you would
>> > allocate ce and then discard when it turns out that it is not
>> > needed, which is probably with the same allocation pressure, but
>> > looks u
Paul Smith writes:
> From: Paul Smith
> Date: Thu, 13 Nov 2014 14:01:34 -0500
> Subject: [PATCH] git-new-workdir: Add -f to force new-workdir in existing
> directory.
>
> Signed-off-by: Paul Smith
> ---
>
> I have an environment I want to use new-workdir for, where the directory
> I need to us
lennart spitzner writes:
> I have a patch for gitk. Should i send it to this list, or is there some
> other? git/Documentation/SubmittingPatches mentions
> git://ozlabs.org/~paulus/gitk (the master of which i based my commit
> on), but never mentions any list(s) by name (only "the Git mailing
>
On Thu, Nov 13, 2014 at 01:10:17PM -0800, Junio C Hamano wrote:
> > How about just adding --stdin, which matches other git commands?
>
> How about doing nothing and use the correct $IFS instead?
Can you cover all cases with $IFS, including filenames with newlines?
I agree it is probably OK in p
On Thu, Nov 13, 2014 at 01:11:46PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > if (c != '.' &&
> > - is_date(num3, num, num2, refuse_future, now, tm))
> > + is_date(num3, num, num2, refuse_future, now, tm, 0))
> > break;
>
>
Jeff King writes:
> On Thu, Nov 13, 2014 at 01:10:17PM -0800, Junio C Hamano wrote:
>
>> > How about just adding --stdin, which matches other git commands?
>>
>> How about doing nothing and use the correct $IFS instead?
>
> Can you cover all cases with $IFS, including filenames with newlines?
Y
On Thu, Nov 13, 2014 at 01:18:43PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Thu, Nov 13, 2014 at 02:26:55PM -0500, Jeff King wrote:
> >
> >> > Makes sense, including the use of strbuf (otherwise you would
> >> > allocate ce and then discard when it turns out that it is not
> >>
On 11/13/2014 07:30 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Junio C Hamano writes:
>>
Signed-off-by: slavomir vlcek
>>
>>> The same comment applies to the log message part.
>>
>> I said:
>>
>>> Will queue; no need to resend.
>>>
>>> Thanks.
>>
>> But one thing to make sure.
On Thu, Nov 13, 2014 at 01:36:48PM -0800, Junio C Hamano wrote:
> > I agree it is probably OK in practice and for the OP's question, but it
> > is nice to have "-z" variants so you do not have to worry about quoting
> > at all. I'd argue that a "--stdin -z" should probably also accept raw
> > file
On Thu, Nov 13, 2014 at 04:36:47PM -0500, Jeff King wrote:
> On Thu, Nov 13, 2014 at 01:11:46PM -0800, Junio C Hamano wrote:
>
> > Jeff King writes:
> >
> > > if (c != '.' &&
> > > - is_date(num3, num, num2, refuse_future, now, tm))
> > > + is_date(num3, num, n
Jeff King writes:
> I agree they are technically orthogonal, but I cannot think of a case
> where I have ever generated actual _pathspecs_, which might have
> wildcards, and needed to use "-z". The point of using "-z" is that you
> do not know what crap you are feeding.
You do not have to genera
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
TTY on Yosemite and higher
Signed-off-by: Mike Blume
---
t/lib-terminal.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh
index 5184549..1311ce0 100644
--- a/t/lib
Mike Blume writes:
> listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
> TTY on Yosemite and higher
>
> Signed-off-by: Mike Blume
> ---
> t/lib-terminal.sh | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh
> in
Jeff King writes:
> On Thu, Nov 13, 2014 at 01:11:46PM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> >if (c != '.' &&
>> > - is_date(num3, num, num2, refuse_future, now, tm))
>> > + is_date(num3, num, num2, refuse_future, now, tm, 0))
>> >
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
TTY on Yosemite and higher
Signed-off-by: Mike Blume
Improved-by: Junio C Hamano
---
t/lib-terminal.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh
index 518454
ah, sorry, didn't realize those were bash-only
On Thu, Nov 13, 2014 at 2:21 PM, Junio C Hamano wrote:
> Mike Blume writes:
>
>> listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
>> TTY on Yosemite and higher
>>
>> Signed-off-by: Mike Blume
>> ---
>> t/lib-terminal.sh | 5 ++
gitk previously allowed sort-by-committer-date.
Now also allow sort-by-author-date.
Separate the three options for ordering in a new line in the
view-config-dialogue, using radio buttons.
Signed-off-by: Lennart Spitzner
---
Found this useful for displaying a history with a rebase-heavy workflow,
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Will tag v2.2.0-rc2 tomorrow and v2.2.0 final hopefully late next
week.
You can find the changes described here in the integration branches
of
This patch adds a gc.garbageexpire setting that, when not set to "now",
makes gc (and prune, prune-packed, and repack) move garbage into a
temporary garbage directory instead of deleting it immediately. The
garbage directory is then cleared out based on gc.garbageexpire.
The motivation for this se
On 11/13/2014 11:01 PM, Mike Blume wrote:
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
TTY on Yosemite and higher
Signed-off-by: Mike Blume
---
t/lib-terminal.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/lib-terminal.sh b/t/lib-termina
On Sun, Nov 09, 2014 at 09:21:49AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > So just to be clear, the behavior we want is that:
> >
> > echo foo >some-new-path
> > git add some-new-path
> > git checkout HEAD -- .
> >
> > will delete some-new-path (whereas the current code turns
Junio C Hamano writes:
>> I agree that a new value "mergeInstead" or something should be
>> invented when/if different workflows want a looser semantics.
>> People would rely not only on "being able to push when clean" but
>> also on "being safely prevented from pushing when not" (and that is
>>
85 matches
Mail list logo
