Make git filter-branch output a useful error message when a single
commit is given instead of a range. Currently, when given a command
like git filter-branch --msg-filter 'echo TEST' -- abc123, it will
give the message Which ref do you want to rewrite?. Instead, what
is needed is a range of
On Wed, Jun 17, 2015 at 08:36:34AM -0700, Junio C Hamano wrote:
Kevin Daudt m...@ikke.info writes:
- require_clean_work_tree pull with rebase Please commit or
stash them.
+ if [ $(git config --bool --get rebase.autostash || echo false)
= false ]
Style (use of
rebase learned to stash changes when it encounters a dirty work tree, but
git pull --rebase does not.
Only verify if the working tree is dirty when rebase.autostash is not
enabled.
Signed-off-by: Kevin Daudt m...@ikke.info
Helped-by: Paul Tan pyoka...@gmail.com
---
git-pull.sh | 3 ++-
When c6458e60 (index-pack: kill union delta_base to save memory,
2015-04-18) attempted to reduce the memory footprint of index-pack,
one of the key thing it did was to keep track of ref-deltas and
ofs-deltas separately.
In fix_unresolved_deltas(), however it forgot that it now wants to
look only
Hi,
A draft of Git Rev News edition 5 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md
Everyone is welcome to contribute in any section, like Junio and
Matthieu already did, either by editing the
above page on GitHub and sending a pull request, or
On Fri, Jul 3, 2015 at 11:04 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
Now that git worktree add has achieved user-facing feature-parity with
git checkout --to, retire the latter.
Move the actual linked worktree
On Fri, Jul 3, 2015 at 10:41 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
+git-worktree could provide more automation for tasks currently
+performed manually or via other commands, such as:
+
+- `add` to create a new
On Fri, Jul 3, 2015 at 10:45 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
Given git checkout --to path HEAD~1, the new worktree's HEAD should
begin life at the current branch's HEAD~1, however, it actually ends up
at
On Sat, Jul 04, 2015 at 07:39:04PM -0400, Chris Jones wrote:
Make git filter-branch output a useful error message when a single
commit is given instead of a range. Currently, when given a command
like git filter-branch --msg-filter 'echo TEST' -- abc123, it will
give the message Which ref do
Hi,
On 2015-07-05 15:07, Jeff King wrote:
On Sat, Jul 04, 2015 at 07:39:04PM -0400, Chris Jones wrote:
Make git filter-branch output a useful error message when a single
commit is given instead of a range. Currently, when given a command
like git filter-branch --msg-filter 'echo TEST' --
Hi,
#: dir.c:1945
msgid Untracked cache is disabled on this system.
-msgstr
+msgstr Cache für unversionierten Dateien ist auf diesem System deaktiviert.
I think it should be Cache für unversionierte Dateien ist auf diesem
System deaktiviert.
#: help.c:214
msgid git commands available
Duy Nguyen pclo...@gmail.com writes:
@@ -1282,28 +1344,25 @@ static void fix_unresolved_deltas(struct sha1file
*f, int nr_unresolved)
* resolving deltas in the same order as their position in the pack.
*/
sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos));
On Fri, Jul 3, 2015 at 10:53 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
COMMANDS
+add path branch::
+
+Check out `branch` into a separate working directory, `path`, creating
+`path` if necessary. The new
The only change is a bugfix: the SMTP mailer was not working with
Python 2.4.
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
I just fixed the title line (1.1.0 - 1.1.0).
contrib/hooks/multimail/CHANGES | 5 +
contrib/hooks/multimail/README | 2 +-
On Fri, Jul 3, 2015 at 11:19 PM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, Jul 4, 2015 at 7:17 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
One of git-worktree's roles is to populate the new worktree, much like
git-checkout, and thus, for convenience, ought to support several of the
same
Hi Paul,
On 2015-07-02 20:16, Paul Tan wrote:
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 3f54bdf..0a19136 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -154,6 +154,17 @@ test_expect_success 'am applies patch correctly' '
test $(git rev-parse second^) = $(git rev-parse
On Thu, Jul 2, 2015 at 10:35 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Karthik Nayak karthik@gmail.com writes:
Add the '--points-at' option provided by 'ref-filter'. The
option lets the user to list only refs which pertain to the
given object.
You are using pertain to (here,
Hi,
On 2015-07-03 18:24, Stefan Beller wrote:
On Thu, Jul 2, 2015 at 11:16 AM, Paul Tan pyoka...@gmail.com wrote:
Increase test coverage of git-am.sh to help prevent regressions that could
arise
from the rewrite of git-am.sh to C. This patch series, along with
pt/am-foreign, improved test
Hi Paul,
On 2015-07-02 20:16, Paul Tan wrote:
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index dd6fe81..62b678c 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -275,6 +275,48 @@ test_expect_success 'am with failing pre-applypatch
hook' '
test_cmp_rev first HEAD
'
Отправлено с iPhone
On Sun, Jul 05, 2015 at 01:13:57PM +0200, Christian Couder wrote:
A draft of Git Rev News edition 5 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md
Everyone is welcome to contribute in any section...
I'm not familiar with the criteria for
On Sun, Jul 5, 2015 at 9:11 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sun, Jul 05, 2015 at 01:13:57PM +0200, Christian Couder wrote:
A draft of Git Rev News edition 5 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md
Everyone is welcome
On Sun, Jul 5, 2015 at 5:13 PM, Christian Couder
christian.cou...@gmail.com wrote:
On Sun, Jul 5, 2015 at 9:11 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sun, Jul 05, 2015 at 01:13:57PM +0200, Christian Couder wrote:
A draft of Git Rev News edition 5 is available here:
On Mon, Jul 6, 2015 at 12:01 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
Unfortunately, the non-ASCII characters
in Duy's name got corrupted, and the botch is present in the patch I
sent. Sorry. Not sure how that happened. Can you fix it locally?
Fixed [1].
[1]
On Sun, Jul 5, 2015 at 6:35 PM, Thomas Ferris Nicolaisen
tfn...@gmail.com wrote:
On Mon, Jul 6, 2015 at 12:01 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
Unfortunately, the non-ASCII characters
in Duy's name got corrupted, and the botch is present in the patch I
sent. Sorry. Not sure
25 matches
Mail list logo
