On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Otherwise we would have to include commit.h.
Was there a reason why commit.h is not included here, just like
revision.h would include diff.h, so that users
On Thu, Oct 31, 2013 at 1:29 PM, Max Horn m...@quendi.de wrote:
Actually, I just noticed one thing that I *do* have a question about:
On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast
On Thu, Oct 31, 2013 at 1:47 PM, Max Horn m...@quendi.de wrote:
On 31.10.2013, at 20:41, Felipe Contreras felipe.contre...@gmail.com wrote:
On Thu, Oct 31, 2013 at 1:29 PM, Max Horn m...@quendi.de wrote:
Actually, I just noticed one thing that I *do* have a question about:
On 31.10.2013
that this was an
occurrence you just happened to run into, and I'm not saying that a
patch has to deal with _all_ occurrences. I'm more just wondering if
we want mention our position, whatever it is, in CodingGuidelines.
Yes, I'm all in favor of updating CodingGuidelines with that.
--
Felipe Contreras
--
To unsubscribe
On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
--- a/Documentation/git-pull.txt
+++ b
?
The situation doesn't change when you use a variable:
if (size_limit john.size)
Translates to if size limit is smaller than john, and still makes no sense.
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
On Thu, Oct 31, 2013 at 2:27 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 12:11 PM, Junio C
On Thu, Oct 31, 2013 at 2:07 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Otherwise we would have to include
, but not when
it doesn't. Got it.
--
Felipe Contreras
--
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 Thu, Oct 31, 2013 at 5:40 PM, David Aguilar dav...@gmail.com wrote:
On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote:
On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
The other reason the original did
On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar dav...@gmail.com wrote:
On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote:
Nobody is forcing you to read them.
You're missing the *key* point.
No one wants to interact with a rude arrogant loudmouth.
Then don't. Problem solved
force=true || force=
echo ok
;;
*)
echo unsupported
;;
esac
;;
But this is definetly good to have, will merge.
--
Felipe Contreras
--
To unsubscribe from
/git-related
--
Felipe Contreras
--
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, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Tue, Oct 29, 2013 at 9:57 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
1) Passing just HEAD as a committish like in git contacts HEAD
does not output anything for me, but using the SHA1 for HEAD does
On Tue, Oct 29, 2013 at 8:17 AM, Sebastian Schuberth
sschube...@gmail.com wrote:
On Tue, Oct 29, 2013 at 11:35 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Tue, Oct 29, 2013 at 3:12 AM, Sebastian Schuberth
sschube...@gmail.com wrote:
$ git related
] https://code.google.com/p/git-fc/
[3] http://felipec.wordpress.com/tag/git-fc/
--
Felipe Contreras
--
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
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 4f47bdd..ef91882 100644
--- a/transport
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index 707351d..f8eb143 100644
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index b6f623e..8ed41b4 100644
--- a/builtin/fast
,
ref-name);
if (private !get_sha1(private, sha1)) {
strbuf_addf(buf, ^%s, private);
Felipe Contreras (10):
transport-helper: add 'force' to 'export' helpers
transport-helper: fix extra lines
transport-helper: check for 'forced update' message
fast
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh| 7 +++
3 files changed, 41
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote
Otherwise they cannot know when to force the push or not (other than
hacks).
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index b32e2d6..408d596 100644
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea
On Sat, Oct 26, 2013 at 11:55 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Sat, Oct 26, 2013 at 11:34 PM, Richard Hansen rhan...@bbn.com wrote:
Patch 2/10 (transport-helper: fix extra lines) deleted one copy of the
lines; patch 9/10 (transport-helper: add support to delete branches
need.
But it doesn't.
--
Felipe Contreras
--
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
write a unquote_c_style() equivalent in python if needed.
Something like this?
def c_style_unescape(string):
if string[0] == string[-1] == '':
return string.decode('string-escape')[1:-1]
return string
It's in git-remote-bzr.py.
--
Felipe Contreras
--
To unsubscribe from this list
they shouldn't be, unless the next version after 1.8 is 2.0. There should
be a separate branch for 2.0.
--
Felipe Contreras
--
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
they deal with change.
* Does libgit2 want to remain under the Git umbrella, or participate
on its own?
Personally I don't see what libgit2 has to do with git.git. There isn't even
communication between the two projects.
--
Felipe Contreras
--
To unsubscribe from this list: send the line
, we are
looking for a name of a concept we already have, and the majority of
users have already given it a name; the staging area.
[1] http://article.gmane.org/gmane.comp.version-control.git/197215
[2] http://article.gmane.org/gmane.comp.version-control.git/168201
--
Felipe Contreras
)
Unless you think that contributing useful patches to Git is off-topic, a person
that does that by definition cannot be a troll.
On 17.10.2013, at 23:44, Felipe Contreras felipe.contre...@gmail.com wrote:
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano
Theodore Ts'o wrote:
On Fri, Oct 18, 2013 at 06:41:41AM -0500, Felipe Contreras wrote:
And I hazard to guess that the vast majority agree with Junio on this
(based,
again, on email evidence). Not with you.
That is irrelevant, and a fallacy. The vast majority of people thought
Karsten Blees wrote:
Am 15.10.2013 00:29, schrieb Felipe Contreras:
tl;dr: everyone except Junio C Hamano and Drew Northup agrees; we should
move
away from the name the index.
It has been discussed many times in the past that 'index' is not an
appropriate description for what
A in the future.
--
Felipe Contreras
--
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
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
Jeff King p...@peff.net writes:
It seems[1] that some
people define ci as commit -a, and some people define st as
status -s or even status -sb.
These option variants aside
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio C Hamano wrote:
Such a review comment and the discussion that follows it after a
patch is posted is an essential part of the collaborative
development process in this community and it has helped the quality
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Junio, can you make an exception and reply to this thread? The change
to move away from the term the index has been suggested many times
since many years ago, it is an extremely important change to users,
and all
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 11:03:26PM -0500, Felipe Contreras wrote:
not some next behavior that may change in future.
But I'm suggesting to add a core.addremove option as well, like you
suggested,
am I not?
Yes, I think we both agreed on adding core.addremove
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 10:55:07PM -0500, Felipe Contreras wrote:
John Szakmeister wrote:
I like the idea that we could kick git into a mode that applies the
behaviors we're talking about having in 2.0, but I'm concerned about
one aspect of it. Not having
John Szakmeister wrote:
On Tue, Oct 15, 2013 at 11:55 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
[snip]
We cannot change the behavior of push.default = simple already, so at least
that option is not in question.
True.
Presumably you are worried about the other options
an experimental branch, many branches would never mature to
go into master, or next, or even pu.
--
Felipe Contreras
--
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
directory you type in her terminal during the session to help her
could work differently from the way you are used to, if we added
such a knob.
That's going to happen regardless. You are assuming she is running Git v2.0,
which she might not.
--
Felipe Contreras
--
To unsubscribe from this list
add_long_pathname
+ git mv long_dirname*/path1 another_extremely_*/
+ test_commit move_long_pathname
+ git diff -M --stat HEAD^ HEAD output
+ test_i18ngrep =.*path1 output
+'
+
test_done
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git
Krzysztof Mazur wrote:
On Mon, Oct 14, 2013 at 04:35:50PM -0500, Felipe Contreras wrote:
Krzysztof Mazur wrote:
On Sat, Oct 12, 2013 at 02:04:45AM -0500, Felipe Contreras wrote:
So that we can specify general modes of operation, specifically, add the
'next' mode, which makes Git pre
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 07:32:39AM -0500, Felipe Contreras wrote:
Krzysztof Mazur wrote:
But with core.mode = next after upgrade you may experience incompatible
change without any warning.
Yes, and that is actually what the user wants. I mean, why would
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 08:29:56AM -0500, Felipe Contreras wrote:
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 07:32:39AM -0500, Felipe Contreras wrote:
Krzysztof Mazur wrote:
But with core.mode = next after upgrade you may experience
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Let's do something like this instead.
- We usually refrain from making such a tree-wide change in order
to avoid unnecessary conflicts
aliases. So if we
agreed on the right values, you would welcome this patch.
Is that correct?
--
Felipe Contreras
--
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
John Szakmeister wrote:
On Tue, Oct 15, 2013 at 10:51 AM, Krzysztof Mazur krzys...@podlesie.net
wrote:
On Tue, Oct 15, 2013 at 08:29:56AM -0500, Felipe Contreras wrote:
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 07:32:39AM -0500, Felipe Contreras wrote:
Krzysztof Mazur wrote
Krzysztof Mazur wrote:
On Tue, Oct 15, 2013 at 01:51:41PM -0500, Felipe Contreras wrote:
I don't see what is the problem. We haven't had the need for push.default =
simplewarning, have we? If you want the warning, you don't change anything,
if
simplewarning makes no sense, because
Jonathan Nieder wrote:
Stefan Beller wrote:
On 10/12/2013 09:07 AM, Felipe Contreras wrote:
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
Not sure if it's worth by a newcomer. ;)
A second set of eyes is always welcome.
My thoughts: I have to admit I don't see much
Krzysztof Mazur wrote:
On Sat, Oct 12, 2013 at 02:04:45AM -0500, Felipe Contreras wrote:
So that we can specify general modes of operation, specifically, add the
'next' mode, which makes Git pre v2.0 behave as Git v2.0.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
Junio C Hamano wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Clearly, a lot of my patches have not been reviewed ...
I think the reason for it most likely is because you earned the Bozo
bit ($gmane/227602) in many reviewers' eyes.
So what you are saying is that the reason
Eric Sunshine wrote:
On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
SYNOPSIS
[verse]
-'git stage' args...
-
+'git stage' [options] [--] [paths...]
+'git stage add' [options] [--] [paths...]
+'git stage reset' [-q|--patch
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/completion/git-completion.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 1dde51f..082f207 100644
--- a/contrib
.
So, --work (the default), doesn't cause any changes, and --no-work
enables the current --cache if used with --index.
Eventually --work might replace --cache, if these options are
standarized in the whole git toolset.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-grep.txt | 5 -
builtin/grep.c | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 8497aa4
Synonym of --index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stash.txt | 8
git-stash.sh| 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-rm.txt | 5 -
builtin/rm.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 1d876c2..156b40d 100644
Synonym for --index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-apply.txt | 5 -
builtin/apply.c | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index f605327
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-diff.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 78d6d50..646e5cd 100644
--- a/Documentation/git
...),
N_(git stage diff [options] [commit] [--] paths...),
N_(git stage rm [options] [--] paths...),
Felipe Contreras (14):
Add proper 'stage' command
stage: add edit command
diff: document --staged
grep: add --staged option
rm: add --staged option
stash: add --stage option
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stage.txt| 45 +
Makefile | 2 +-
builtin.h | 1 +
builtin/stage.c| 52
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-submodule.txt | 8 ++--
git-submodule.sh| 10 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-submodule.txt b/Documentation/git
--no-stage is synonym for --keep-index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stash.txt | 6 +++---
git-stash.sh| 8 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/completion/git-completion.bash | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 2b81e78..1dde51f 100644
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-reset.txt | 8
builtin/reset.c | 20
2 files changed, 28 insertions(+)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index f445cb3..5cd75a8 100644
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-reset.txt | 2 +-
builtin/reset.c | 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 5cd75a8..a1419c9
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-stage.txt| 5 +++
builtin/stage.c| 75 ++
contrib/completion/git-completion.bash | 4 +-
3 files changed, 83 insertions(+), 1 deletion(-)
diff
On Mon, Oct 14, 2013 at 5:29 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
tl;dr: everyone except Junio C Hamano and Drew Northup agrees; we should move
away from the name the index.
Junio, can you make an exception and reply to this thread? The change
to move away from the term
On Mon, Oct 14, 2013 at 6:06 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
diff --git a/builtin/stage.c b/builtin/stage.c
new file mode 100644
index 000..3023d17
--- /dev/null
+++ b/builtin/stage.c
On Sun, Oct 13, 2013 at 5:03 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
diff --git a/t/t5529-push-publish.sh b/t/t5529-push-publish.sh
new file mode 100755
index 000..2037026
--- /dev/null
+++ b/t
On Sun, Oct 13, 2013 at 4:53 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Synonym for --index.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-apply.txt | 5
of view.
--
Felipe Contreras
--
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 Sun, Oct 13, 2013 at 4:56 PM, David Aguilar dav...@gmail.com wrote:
On Sat, Oct 12, 2013 at 12:07 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Virtually all packaging guidelines would prefer 1.8.4~rc1, over
1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead
On Mon, Oct 14, 2013 at 12:01 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Hi,
David Aguilar wrote:
Felipe Contreras felipe.contre...@gmail.com wrote:
Virtually all packaging guidelines would prefer 1.8.4~rc1, over
1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead
On Fri, Oct 11, 2013 at 11:40 PM, Richard Hansen rhan...@bbn.com wrote:
On 2013-10-11 22:08, Felipe Contreras wrote:
I'm fine with 'echo warning: foo 2', but still, if you really
cared about consistency, there would be a warn() function
So add one! It's only one simple line:
warning
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/branch.c | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0836890..ac17b18 100644
--- a/builtin/branch.c
+++ b/builtin
.
Felipe Contreras (2):
branch: trivial cleanup
branch: reorganize verbose options
builtin/branch.c | 33 +++--
t/t6040-tracking-info.sh | 8
2 files changed, 19 insertions(+), 22 deletions(-)
--
1.8.4-fc
--
To unsubscribe from this list: send
Showing the upstream tracking branch is more important than how many
commits are ahead/behind, so now 'git branch -v' shows the upstream, but
not the tracking info, and 'git branch -vv' shows all information (as
before).
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin
on this mode can be enabled by default (e.g. in v2.0).
For the full discussion you can read:
http://thread.gmane.org/gmane.comp.version-control.git/225146/focus=225305
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/config.txt | 8 +---
git-pull.sh | 13
, they know what to type without interrupting or changing their
workflow.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-pull.sh | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 6e6b887..d1b07d8 100755
--- a/git-pull.sh
Also, deprecate --no-rebase since there's no need for it any more.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 8 ++--
git-pull.sh| 6 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Documentation/git
Also 'branch.name.rebase' to 'branch.name.pullmode'.
This way 'pull.mode' can be set to 'merge', and the default can be
something else.
The old configurations still work, but get deprecated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/config.txt | 22
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 18 ++
1 file changed, 18 insertions(+)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 6d55737..b4053a8 100644
--- a/Documentation/git-pull.txt
+++ b
or a rebase, falling back to old style for now (git pull --merge).
-Read 'git pull --help' for more information.
+Read 'git pull --help' for more information.) 2
;;
esac
fi
Felipe Contreras (7):
pull: rename pull.rename to pull.mode
pull: refactor
'origin/master' is very clear, no need to specify the 'remotes/' prefix,
or babysit the user.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-pull.sh | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 8363647..f53d193 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -48,8 +48,7 @@ if test -z $mode
Now we use PYTHON_PATH properly, and also we are able to do:
make -C contrib/remote-helpers install
Felipe Contreras (5):
remote-helpers: generate scripts
build: fix installation of scripts
remote-helpers: rename tests
remote-helpers: allow direct test execution
remote-helpers: add
For now simply add a few common aliases.
co = checkout
ci = commit
rb = rebase
st = status
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-checkout.txt | 5 +
Documentation/git-commit.txt | 5 +
Documentation/git-rebase.txt | 5
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/completion/git-completion.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 1dde51f..082f207 100644
--- a/contrib
This way we don't have to modify the PATH ourselves and it's easier to
test without 'make'.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/Makefile | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/Makefile b
So that we can specify general modes of operation, specifically, add the
'next' mode, which makes Git pre v2.0 behave as Git v2.0.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 13
cache.h| 6 ++
config.c | 13
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen rhan...@bbn.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
the previous discussions:
http://thread.gmane.org/gmane.comp.version-control.git/197111
http://thread.gmane.org/gmane.comp.version-control.git/166675
http://thread.gmane.org/gmane.comp.version-control.git/115666
Felipe Contreras (14):
Add proper 'stage' command
stage: add edit command
diff
Otherwise they cannot know when to force the push or not (other than
hacks).
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
transport-helper.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index 63cabc3..cd913af 100644
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 7f314f0..9b728ca 100644
--- a/builtin/fast
Synonym for --cached.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-rm.txt | 5 -
builtin/rm.c | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 1d876c2..156b40d 100644
701 - 800 of 3053 matches
Mail list logo
