From: Amit Bakshi ambak...@gmail.com
git clone hangs on windows, and file.write would return errno 22 inside
of mercurial's windows.winstdout wrapper class. This patch sets stdout's
mode to binary, fixing both issues.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
On Sun, May 19, 2013 at 6:17 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
[PATCH 3/9] for-each-ref: avoid printing each element directly to stdout
Why did you do this? Atoms are designed to be independent of each
other. I'll keep reading: might find out in a later patch.
Sorry for the
On Sun, May 19, 2013 at 6:54 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Felipe Contreras wrote:
You can't represent push.default = single either.
Right. And I propose that we extend the refspec to be able to
represent it, instead of having single sticking out like a sore
thumb (and
On Sun, May 19, 2013 at 6:53 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
From: Amit Bakshi ambak...@gmail.com
git clone hangs on windows, and file.write would return errno 22 inside
of mercurial's windows.winstdout wrapper class. This patch sets stdout's
mode to binary, fixing both
On Sun, May 19, 2013 at 6:48 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Duy Nguyen wrote:
Exactly. I already explained why %(upstream) can't be used in 00/09.
tracking may not be perfect. Somebody might want
tracking:upstream:short. It does not look quite nice.
Which is why I
On Fri, May 17, 2013 at 9:55 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
You can now do something like
$ git for-each-ref --format='%C(red)%(refname:short)%C(reset)
%C(blue)%(upstream:diff)%C(reset)' --count 5 --sort='-committerdate'
refs/heads
To get output that's much more
Duy Nguyen wrote:
Hmm.. I missed that mail (or I wouldn't have worked on this already).
Do you want to take over?
Oh, we can collaborate on one beautiful series :)
branch -vv shows [upstream: ahead x, behind y]. We need a syntax to
cover that too.
Can't we construct that using
On Sun, May 19, 2013 at 6:51 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Felipe Contreras wrote:
% git checkout fc/remote/hg-next
% git rebase -i # rebase to master
% git checkout fc/remote/hg-notes
% git rebase -i # rebase to fc/remote/hg-next
% git checkout
My itch is very simple.
Felipe Contreras wrote:
% git checkout fc/remote/hg-next
% git rebase -i # rebase to master
% git pull # I want: pull from origin
% git checkout fc/remote/hg-notes
% git rebase -i # rebase to fc/remote/hg-next
% git pull # I want: pull from ram
% git checkout
On Sun, May 19, 2013 at 7:08 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
branch -vv shows [upstream: ahead x, behind y]. We need a syntax to
cover that too.
Can't we construct that using [%(upstream:short): %(upstream:diff)]?
It's nothing fundamental.
If there is no upstream, []
On Sun, May 19, 2013 at 7:26 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
My itch is very simple.
Felipe Contreras wrote:
% git checkout fc/remote/hg-next
% git rebase -i # rebase to master
% git pull # I want: pull from origin
Then do 'git pull origin', 'fc/remote/hg-next' has
Duy Nguyen wrote:
I don't think you can easily borrow parsing code from pretty-formats
(but I may be wrong). Anyway new stuff with new syntax would look
alien in for-each-ref format lines. Either we bring --pretty to
for-each-ref, leaving all for-each-ref atoms behind in --format, or we
When using git cherry or git log --cherry-pick we often have a small
number of commits on one side and a large number on the other. In
revision.c::cherry_pick_list we store the patch IDs for the small side
before comparing the large side to this.
In this case, it is likely that only a small
On Sun, May 19, 2013 at 2:56 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Fri, May 17, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote:
So when the user is running git fetch on mywork branch that
Okay, let's look at this part.
Felipe Contreras wrote:
diff --git a/contrib/related/git-related b/contrib/related/git-related
new file mode 100755
index 000..4f31482
--- /dev/null
+++ b/contrib/related/git-related
@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby
+
+# This script finds people
On Sun, May 19, 2013 at 9:40 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Okay, let's look at this part.
Felipe Contreras wrote:
diff --git a/contrib/related/git-related b/contrib/related/git-related
new file mode 100755
index 000..4f31482
--- /dev/null
+++
Felipe Contreras wrote:
How exactly is it not equivalent to len = len || 1?
Here, I dug up an article for you on the issue:
http://www.rubyinside.com/what-rubys-double-pipe-or-equals-really-does-5488.html
Although it's fine in this case, I wouldn't recommend using ||=
because of the potential
Felipe Contreras wrote:
Will $2 ever be nil (from fmt_person)? ie. Why are you checking for
the special case \S+?$?
Yes, 'email' was valid in earlier versions of git.
There's a non-optional space before the email in your regex, which
is what I was pointing out.
--
To unsubscribe from this
Ramkumar Ramachandra wrote:
There's a non-optional space before the email in your regex, which
is what I was pointing out.
Er, scratch that. It's the space after the Whatevered-by:
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Sun, May 19, 2013 at 10:13 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Felipe Contreras wrote:
How exactly is it not equivalent to len = len || 1?
Here, I dug up an article for you on the issue:
http://www.rubyinside.com/what-rubys-double-pipe-or-equals-really-does-5488.html
On Sun, May 19, 2013 at 10:17 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Ramkumar Ramachandra wrote:
There's a non-optional space before the email in your regex, which
is what I was pointing out.
Er, scratch that. It's the space after the Whatevered-by:
It doesn't really matter. We
On Sun, May 19, 2013 at 10:05 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Sun, May 19, 2013 at 9:40 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
+ '-L', '%u,+%u' % [start, len],
+ '--since', $since, from + '^',
+ '--', source]) do
This script find people that might be interested in a patch, by going
back through the history for each single hunk modified, and finding
people that reviewed, acknowledge, signed, or authored the code the
patch is modifying.
It does this by running 'git blame' incrementally on each hunk, and
2013/5/16 Holger Hellmuth (IKS) hellm...@ira.uka.de:
+bare repository= bloßes Repository
Since bloßes Rep. does not convey any sensible meaning to a german reader
(at least it doesn't to me) it might as well be bare. Also bare is used as
parameter to commands
+remote
2013/5/16 Thomas Rast tr...@inf.ethz.ch:
Ralf Thielow ralf.thie...@gmail.com writes:
Hi,
I think the discussion might work better via ML than GitHub.
This is the full glossary of git's de.po as it would look
like with (hopefully) all the changes included that have been
discussed here.
Hi,
here's an updated version of the glossary. Comments are appreciated.
Basic repository objects:
blob = Blob
tree = Baum, Baum-Objekt (bevorzugt), Tree-Objekt
submodule = Submodul
pack(noun) = Pack-Datei
pack(verb) = packen (ggf. Pack-Datei
2013/5/16 Holger Hellmuth (IKS) hellm...@ira.uka.de:
[...]
+reset = neu setzen (maybe umsetzen?)
zurücksetzen
reset can be used with every existing commit. zurücksetzen
would imply that it have to be a recent commit, no?
--
To unsubscribe from this list: send the line unsubscribe git in
Hi,
Philip Oakley wrote:
The Git cli will generally accept dot '.' (period) as equivalent
to the current repository when appropriate. Tell the reader of this
'do what I mean' (dwim)mery action.
[...]
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -59,6 +59,10 @@ working
Philip Oakley wrote:
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -734,6 +734,8 @@ branch.name.remote::
overridden by `branch.name.pushremote`. If no remote is
configured, or if you are not on any branch, it defaults to
`origin` for fetching and
John Keeping wrote:
In this case, it is likely that only a small number of paths are touched
by the commits on the smaller side of the range and by storing these we
can ignore many commits on the other side before unpacking blobs and
diffing them.
I like this idea a lot.
--- a/patch-ids.c
Prior to this patch series, the refs API said nothing about the
lifetime of the refname parameter passed to each_ref_fn callbacks by
the for_each_ref()-style iteration functions. De facto, the refnames
usually had long lives because they were pointers into the ref_cache
data structures, and those
Do not retain references to refnames passed to the each_ref_fn
callback add_existing(), because their lifetime is not guaranteed.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/fetch.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/fetch.c
Instead of assuming that the memory pointed to by the name argument
will live forever, make a local copy of it before storing it in the
ref_cmdline_info.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
revision.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
revision.c | 20 ++--
revision.h | 32 +---
2 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/revision.c b/revision.c
index 25e424c..8ac88d6 100644
--- a/revision.c
+++
The source of this nonsense was
04d3975937 fsck: reduce stack footprint
, which wedged a pointer to parent into the object_array_entry's name
field. The parent pointer was passed to traverse_one_object(), even
though that function *didn't use it*.
The useless code has been deleted over
No names are ever set for the object_array_entries in merges, so there
is no need to pretend to copy them to the result array.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
submodule.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c
Change object_array and object_array_entry to copy the name before
storing it in the name field, and free it when an entry is deleted
from the array. This is useful because some of the name strings
passed to add_object_array() or add_object_array_with_mode() are
refnames whose lifetime is not
It's not a list, it's an array entry.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
builtin/diff.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/diff.c b/builtin/diff.c
index 72d99c0..7cac6de 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
submodule.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c
index e728025..b837c04 100644
--- a/submodule.c
+++ b/submodule.c
@@ -846,7 +846,7 @@ static int find_first_merges(struct
The condition under which gc_boundary() is called was previously
if (alloc = nr)
. But by construction, nr can never exceed alloc, so the check looks
unnecessarily mysterious. In fact, the purpose of the check is to try
to avoid a realloc() call by shrinking the array if possible if it is
On Sat, May 18, 2013 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
Thanks Eric and Junio. I looked over the patches and they look good.
Are you sure about that? It seemed to me that it was breaking
everybody that is not on MacOS X --- did I
From: Jonathan Nieder jrnie...@gmail.com
Sent: Sunday, May 19, 2013 6:39 PM
Hi,
Philip Oakley wrote:
The Git cli will generally accept dot '.' (period) as equivalent
to the current repository when appropriate. Tell the reader of this
'do what I mean' (dwim)mery action.
[...]
---
Jonathan Nieder jrnie...@gmail.com writes:
Philip Oakley wrote:
Describe rebase in the description section.
It already does that. :) I think you mean start with a summary,
which is a valuable improvement.
It indeed is a good idea to give the high-level introduction at
the very beginning,
Jonathan Nieder jrnie...@gmail.com writes:
@@ -64,6 +199,13 @@ static struct patch_id *add_commit(struct commit *commit,
unsigned char sha1[20];
int pos;
+if (no_add) {
+if (collect_touched_paths(commit, ids, 1) 0)
+return NULL;
Ah, so
Albert Netymk albertnet...@gmail.com writes:
On Sun, May 19, 2013 at 9:46 AM, Junio C Hamano gits...@pobox.com wrote:
Albert Netymk albertnet...@gmail.com writes:
Hello,
The man page of git-diff-index:
http://git-scm.com/docs/git-diff-index
states that
`git-diff-index - Compares content
When you trying to add submodule, that already has submodule, it craches.
For example you could try: git clone --recursive
http://github.com/Exsul/al_server
Its happens because git dont create `modules` directory.
al_server/.git/modules
Workaround for it wont work to:
git submodule update
On Mon, May 20, 2013 at 1:01 AM, Junio C Hamano gits...@pobox.com wrote:
Subject: [PATCH] Documentation/diff-index: mention two modes of operation
diff-index can be used to compare a tree with the tracked working
tree files (when used without the --index option), or with the index
(when used
Philip Oakley philipoak...@iee.org writes:
From: Junio C Hamano gits...@pobox.com
Sent: Friday, May 17, 2013 7:30 PM
Subject: Re: [PATCH 1/3] fetch: add --allow-local option
[...]
So when the user is running git fetch on mywork branch that
happens to be forked from a local master, i.e.
Kevin Bracey ke...@bracey.fi writes:
I found myself thinking the same thing. It's really convenient being
able to set your topic branch's upstream to another local branch, so
What is that another local branch? ... And if that is your workflow,
setting
push.default to current (and setting
David Aguilar dav...@gmail.com writes:
On Fri, May 17, 2013 at 7:12 PM, Junio C Hamano gits...@pobox.com wrote:
So it is a right thing to do in that sense.
I however am having this nagging feeling that I may be missing
something subtle here. Comments from others are very much welcome.
David Aguilar dav...@gmail.com writes:
Thanks Eric and Junio. I looked over the patches and they look good.
Are you sure about that? It seemed to me that it was breaking
everybody that is not on MacOS X --- did I misread the patch?
--
To unsubscribe from this list: send the line unsubscribe
Junio C Hamano gits...@pobox.com writes:
Ramkumar Ramachandra artag...@gmail.com writes:
...
-Gregex::
-Look for differences whose added or removed line matches
-the given regex.
+Grep through the patch text of commits for added/removed lines
+that match regex.
Felipe Contreras felipe.contre...@gmail.com writes:
On Sat, May 18, 2013 at 6:46 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
contrib/related/git-related | 124
1 file changed, 124 insertions(+)
create mode 100755
Albert Netymk albertnet...@gmail.com writes:
Hello,
The man page of git-diff-index:
http://git-scm.com/docs/git-diff-index
states that
`git-diff-index - Compares content and mode of blobs between the index
and repository`.
However, in fact this command compares between files on disk and
Peter Lauri peterla...@gmail.com writes:
Great, I have gotten the concept now :)
My workaround for my problem is to rename the file to default and
then all will work out well :) Copy the file then and locally modify
it, but it will be in .gitignore so not tracked :)
I think it is not
Felipe Contreras felipe.contre...@gmail.com writes:
Sorry Amit, I assumed this patch made it to the list, but I just
realized it didn't; it doesn't allow HTML, and mails and silently
dropped (I hate that).
So I'm sending it so the list can see it:
It seems OK for me, but I would like to
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Fri, May 17, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
This is irrelevant, it's an implementation detail of 'git pull'. *THE
USER* is not
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Fri, May 17, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote:
So when the user is running git fetch on mywork branch that
happens to be forked from a local master,...
we still need to have FETCH_HEAD
Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
And it would be ideal if the initial base and push tracking
information could be set up automatically on the first git checkout
-b/git branch and git push.
I think checkout and branch is already covered with -t. There may
even
Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
On Fri, May 17, 2013 at 7:12 PM, Junio C Hamano gits...@pobox.com wrote:
So it is a right thing to do in that sense.
I however am having this nagging feeling that I may be missing
something subtle here. Comments from
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Sat, May 18, 2013 at 6:46 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
contrib/related/git-related | 124
1 file changed, 124 insertions(+)
create
This is a re-roll of David Aguilar's patch series [1] which eliminates some
of the OpenSSL deprecation warnings on Mac OS X.
Changes since v7:
- Avoid double-negation (#ifndef NO_APPLE_COMMON_CRYPTO)
- Don't break imap-send.c for platforms other than Apple
[1]:
From: David Aguilar dav...@gmail.com
As of Mac OS X 10.7, Apple deprecated all OpenSSL functions due to
OpenSSL ABI instability, thus leading to build warnings. As a
replacement, Apple encourages developers to migrate to its own (stable)
CommonCrypto facility.
Introduce boilerplate which
From: David Aguilar dav...@gmail.com
As of Mac OS X 10.7, Apple deprecated all OpenSSL functions due to
OpenSSL ABI instability, thus leading to build diagnostics such as:
warning: 'SHA1_Init' is deprecated
(declared at /usr/include/openssl/sha.h:121)
Silence the warnings by
From: David Aguilar dav...@gmail.com
As of Mac OS X 10.7, Apple deprecated all OpenSSL functions due to
OpenSSL ABI instability. Silence the warnings by using Apple's
CommonCrypto HMAC replacement functions.
[es: reworded commit message; check APPLE_COMMON_CRYPTO instead of
abusing
By the time show_ref() is called, atom values for all refs are
ready. This can be taken advantage of later.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/for-each-ref.c | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/for-each-ref.c | 39 +++
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index a9d189c..1390da8 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/for-each-ref.c | 25 ++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 1390da8..3240ca0 100644
--- a/builtin/for-each-ref.c
+++
On 18/05/2013 23:37, Peter Lauri wrote:
Great, I have gotten the concept now :)
My workaround for my problem is to rename the file to default and
then all will work out well :) Copy the file then and locally modify
it, but it will be in .gitignore so not tracked :)
Over in the #git IRC
Nguyễn Thái Ngọc Duy wrote:
The purpose of this series is to make for-each-ref --format powerful
enough to display what branch -v and branch -vv do so that we
could get rid of those display code and use for-each-ref code instead.
Damn, you beat me to it. I just introduced color, and was
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 08d4eb1..498d703 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -75,6 +75,7 @@ static struct {
{ upstream },
{ symref },
{ flag },
+ { current
[PATCH 3/9] for-each-ref: avoid printing each element directly to stdout
Why did you do this? Atoms are designed to be independent of each
other. I'll keep reading: might find out in a later patch.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 498d703..b10d48a 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -76,6 +76,8 @@ static struct {
{ symref },
{ flag },
{ current },
+ { tracking
On Mon, Jan 28, 2013 at 4:13 PM, Amit Bakshi ambak...@gmail.com wrote:
git clone hangs on windows (msysgit/cygwin), and
file.write would return errno 22 inside of mercurial's
windows.winstdout wrapper class. This patch sets
stdout's mode to binary, fixing both issues.
---
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index b10d48a..db5c211 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -78,6 +81,7 @@ static struct {
{ current },
{ tracking },
{ tracking:upstream },
+
I don't think [7/9] and [8/9] belong in this series. Let's see how
you've used it in :aligned.
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 1390da8..3240ca0 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -1012,8 +1013,26
On Sun, May 19, 2013 at 6:11 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Yes, I think this is the direction we should be taking. Poorly
thought-out stuff like -v and -vv should be deprecated.
Of course not. They are useful and user-friendly.
The only question is what should be the
On Sun, May 19, 2013 at 6:18 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 498d703..b10d48a 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -76,6 +76,8 @@ static struct {
On Sun, May 19, 2013 at 5:27 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
quote.c | 17 -
1 file changed, 4 insertions(+), 13 deletions(-)
No functional changes I suppose.
--
Felipe Contreras
--
To unsubscribe
On Sun, May 19, 2013 at 5:27 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/for-each-ref.c | 14 ++
quote.c| 44 ++--
quote.h| 6 +++---
On Sun, May 19, 2013 at 6:32 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
I don't think [7/9] and [8/9] belong in this series. Let's see how
you've used it in :aligned.
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 1390da8..3240ca0
On Sun, May 19, 2013 at 6:38 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Sun, May 19, 2013 at 6:18 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Nguyễn Thái Ngọc Duy wrote:
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 498d703..b10d48a 100644
---
Junio C Hamano wrote:
If somebody implements the push.default = single (see the original
message you are responding to), then the change might be smaller.
I think this is a bad hack covering up an underlying problem: it is
ugly, confusing, and inextensible in my opinion. I think of
On Sun, May 19, 2013 at 6:44 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Junio C Hamano wrote:
If somebody implements the push.default = single (see the original
message you are responding to), then the change might be smaller.
I think this is a bad hack covering up an underlying
Duy Nguyen wrote:
Exactly. I already explained why %(upstream) can't be used in 00/09.
tracking may not be perfect. Somebody might want
tracking:upstream:short. It does not look quite nice.
Which is why I suggested keeping upstream, upstream:short, and
introducing upstream:diff and
Felipe Contreras wrote:
% git checkout fc/remote/hg-next
% git rebase -i # rebase to master
% git checkout fc/remote/hg-notes
% git rebase -i # rebase to fc/remote/hg-next
% git checkout fc/remote/hg-gitifyhg-compat
% git rebase -i # rebase to fc/remote/hg-notes
So it is rebase, but
Recent discussions have shown that rebase isn't as well understood as
as perhaps it should be for the basic user.
Add a softer introductory paragraph to the man page description, and
in the second patch, add a second paragraph explaining the build up of
the command so that users have a
Give details of the implied priority in the description section.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
wording based on:
http://article.gmane.org/gmane.comp.version-control.git/222581
http://article.gmane.org/gmane.comp.version-control.git/223816
Describe rebase in the description section.
Include a softer paraphrased version from the crytic, well-loved,
but sometimes parodied, Name description, and tell users that merge
commits are excluded by default.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
branch.name.remote can be set to '.' (period) as a dot repository
as part of the remote name dwimmery. Tell the reader.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Documentation/config.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/config.txt
The Git cli will generally accept dot '.' (period) as equivalent
to the current repository when appropriate. Tell the reader of this
'do what I mean' (dwim)mery action.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Documentation/gitcli.txt | 4
1 file changed, 4 insertions(+)
diff
The dot repository convention is not well know to users and its
documenation is hidden as a note in an ancilliary config variable's
documenation.
Document the dot repository 'do what I mean' convention in the
config variable it is used in, and in the cli (command line interface)
documenation page
On Sun, May 19, 2013 at 6:11 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Nguyễn Thái Ngọc Duy wrote:
The purpose of this series is to make for-each-ref --format powerful
enough to display what branch -v and branch -vv do so that we
could get rid of those display code and use
Felipe Contreras wrote:
You can't represent push.default = single either.
Right. And I propose that we extend the refspec to be able to
represent it, instead of having single sticking out like a sore
thumb (and possibly introducing more sore thumbs like this in the
future).
--
To unsubscribe
94 matches
Mail list logo
