Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Junio C Hamano wrote:
> >> Jeff King writes:
> >>
> >> > It seems[1] that some
> >> > people define "ci" as "commit -a", and some people define "st"
ause this one makes it clear that is volatile (although
probably not that much).
> If we really want a run-time switch for this, I suspect an appropriately
> named environment variable would work better, since we have a history of
> being able to remove those without alarming people.
The fact that B has done the job in the past, doesn't mean it would do the job
better than 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
-user setting will make it unnecessarily harder
> to run to help your coworker when she is having problems. "git add
> 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 go
al stuff.
There is no place in the Git repository for pack-v4, because there's no place
for experimental patches.
> So maybe this is a non-issue. By the time it lands on master, we should have
> decided whether the feature is worth keeping or not.
I believe without an expe
John Szakmeister wrote:
> On Tue, Oct 15, 2013 at 11:55 PM, Felipe Contreras
> 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 a
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
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,
> > a
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,
>
John Szakmeister wrote:
> On Tue, Oct 15, 2013 at 10:51 AM, 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 wrot
an train my fingers to type that.
If you have a better alias than 'ci', then by all means, throw away your
suggestion.
Now, if you are commenting on the aliases, that would mean you are not against
the idea of aliaes per se, but more about values of those aliases. So if we
agreed
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Signed-off-by: Felipe Contreras
> > ---
>
> Let's do something like this instead.
>
> - We usually refrain from making such a tree-wide change in order
>to avoid unnecessary conflicts with other
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:
> > > > >
> > &g
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.
> >
> >
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
ill_print_name(file);
> + fill_print_name(file, INT_MAX);
> if (!file->is_renamed)
> write_name_quoted(file->name, options->file,
> options->line_termination);
> @@ -4258,7 +4397,7 @@ static void show_mode_change(FILE *file, struct
> diff_filepair *p, int show_name,
> static void show_rename_copy(FILE *file, const char *renamecopy, struct
> diff_filepair *p,
> const char *line_prefix)
> {
> - char *names = pprint_rename(p->one->path, p->two->path);
> + char *names = pprint_rename(p->one->path, p->two->path, INT_MAX);
>
> fprintf(file, " %s %s (%d%%)\n", renamecopy, names,
> similarity_index(p));
> free(names);
> diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
> index 2f327b7..03d6371 100755
> --- a/t/t4001-diff-rename.sh
> +++ b/t/t4001-diff-rename.sh
> @@ -156,4 +156,16 @@ test_expect_success 'rename pretty print common prefix
> and suffix overlap' '
> test_i18ngrep " d/f/{ => f}/e " output
> '
>
> +test_expect_success 'rename of very long path shows =>' '
> + mkdir long_dirname_that_does_not_fit_in_a_single_line &&
> + mkdir another_extremely_long_path_but_not_the_same_as_the_first &&
> + cp path1 long_dirname*/ &&
> + git add long_dirname*/path1 &&
> + test_commit 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" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 14, 2013 at 6:06 PM, Eric Sunshine wrote:
> On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras
> wrote:
>> diff --git a/builtin/stage.c b/builtin/stage.c
>> new file mode 100644
>> index 000..3023d17
>> --- /dev/null
>> +++ b/builtin/stage.c
&g
On Mon, Oct 14, 2013 at 5:29 PM, Felipe Contreras
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 &quo
Signed-off-by: Felipe Contreras
---
Documentation/git-stage.txt| 5 +++
builtin/stage.c| 75 ++
contrib/completion/git-completion.bash | 4 +-
3 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/Documentation/git
--no-stage is synonym for --keep-index.
Signed-off-by: Felipe Contreras
---
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-stash.txt
index db7e803
Signed-off-by: Felipe Contreras
---
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
--- a/contrib/completion/git
Signed-off-by: Felipe Contreras
---
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
--- a/Documentation/git
Signed-off-by: Felipe Contreras
---
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 100644
--- a/Documentation/git
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
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-submodule.txt
index
Signed-off-by: Felipe Contreras
---
Documentation/git-stage.txt| 45 +
Makefile | 2 +-
builtin.h | 1 +
builtin/stage.c| 52 ++
contrib
Synonym for --index.
Signed-off-by: Felipe Contreras
---
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..8c047ef 100644
--- a
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
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-diff.txt
+++ b/Documentation
.c
+++ b/builtin/stage.c
@@ -13,6 +13,7 @@
static const char *const stage_usage[] = {
N_("git stage [options] [--] ..."),
N_("git stage add [options] [--] ..."),
+ N_("git stage apply [options] [...]"),
N_("git stage reset [-q|--patch] [-
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
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
--- a/Documentation/git
dify, or not, the working directory.
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 Contrer
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
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..9f7899c 100644
--- a
Synonym of --index.
Signed-off-by: Felipe Contreras
---
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 21a01c2..5fdaa35 100644
--- a
Signed-off-by: Felipe Contreras
---
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/completion/git
Eric Sunshine wrote:
> On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
> wrote:
> > SYNOPSIS
> >
> > [verse]
> > -'git stage' args...
> > -
> > +'git stage' [options] [--] [...]
> > +'git stage add' [opti
Junio C Hamano wrote:
> Felipe Contreras 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 r
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
Jonathan Nieder wrote:
> Stefan Beller wrote:
> > On 10/12/2013 09:07 AM, Felipe Contreras wrote:
>
> >> Signed-off-by: Felipe Contreras
> >
> > Not sure if it's worth by a newcomer. ;)
>
> A second set of eyes is always welcome.
>
> My t
On Mon, Oct 14, 2013 at 12:01 AM, Jonathan Nieder wrote:
> Hi,
>
> David Aguilar wrote:
>> Felipe Contreras 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 Sun, Oct 13, 2013 at 4:56 PM, David Aguilar wrote:
> On Sat, Oct 12, 2013 at 12:07 AM, Felipe Contreras
> 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.
>>
>> In par
nym is actually --index, not --cached. So
--stage makes more sense from those two points 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:53 AM, Eric Sunshine wrote:
> On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras
> wrote:
>> Synonym for --index.
>>
>> Signed-off-by: Felipe Contreras
>> ---
>> Documentation/git-apply.txt | 5 -
>> builtin/apply.c
On Sun, Oct 13, 2013 at 5:03 AM, Eric Sunshine wrote:
> On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras
> wrote:
>> diff --git a/t/t5529-push-publish.sh b/t/t5529-push-publish.sh
>> new file mode 100755
>> index 000..2037026
>> --- /dev/null
>> +++
On Sat, Oct 12, 2013 at 11:18 AM, Philip Oakley wrote:
> From: "Felipe Contreras"
> Sent: Saturday, October 12, 2013 8:24 AM
>> Clearly, a lot of my patches have not been reviewed properly, so even
>> though they are technically correct, and would benefit users, so
/*
* bunch of stuff
*/
}
while (foo)
bar();
foobar();
Cheers.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
mmary, and you can also find a web version:
https://github.com/felipec/git/wiki/My-patches
Cheers.
=== branch: improve verbose option ===
People have commented that this is a good change, yet it's ignored.
----
Felipe Contreras (2):
branch: trivial cleanup
branch: reorgani
Suggested-by: Duy Nguyen
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 2 +-
contrib/related/test-related.t | 12
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index f94f5f4..3399307
participation.
For example:
% git related master..fc/transport/improv
Junio C Hamano (signer: 90%, author: 5%)
Felipe Contreras (author: 25%, reviewer: 2%)
Sverre Rabbelier (author: 17%, acker: 2%, signer: 7%)
Jeff King (acker: 17%, author: 10%)
Shawn O. Pearce (author: 5%, signer
Signed-off-by: Felipe Contreras
---
revision.c | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/revision.c b/revision.c
index 0173e01..4049867 100644
--- a/revision.c
+++ b/revision.c
@@ -1503,7 +1503,7 @@ struct cmdline_pathspec {
static void append_prune_data
Signed-off-by: Felipe Contreras
---
alias.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/alias.c b/alias.c
index eb9f08b..9938f03 100644
--- a/alias.c
+++ b/alias.c
@@ -5,7 +5,7 @@ static char *alias_val;
static int alias_lookup_cb(const char *k, const
No functional changes.
Signed-off-by: Felipe Contreras
---
GIT-VERSION-GEN | 36
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 06026ea..e96538d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
t's considered newer.
The same happens in dpkg.
Signed-off-by: Felipe Contreras
---
GIT-VERSION-GEN | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e96538d..c04c4de 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -28,7 +28,7 @@ then
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras
---
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-helpers.sh
index 8c
To setup publish tracking branch, like 'git branch --set-publish'.
Signed-off-by: Felipe Contreras
---
Documentation/git-push.txt | 9 +-
builtin/push.c | 2 ++
t/t5529-push-publish.sh| 70 ++
transport.c
Signed-off-by: Felipe Contreras
---
contrib/related/Makefile | 17 +
contrib/related/test-related.t | 54 ++
2 files changed, 71 insertions(+)
create mode 100644 contrib/related/Makefile
create mode 100755 contrib/related/test-related.t
For example master..feature-a.
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 57 +++---
contrib/related/test-related.t | 10
2 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/contrib/related/git-related b/contrib
Synonym for --cached.
Signed-off-by: Felipe Contreras
---
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-diff.txt
+++ b/Documentation
No functional changes.
Signed-off-by: Felipe Contreras
---
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/branch.c
@@ -425,16 +425,15
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras
---
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 8e19058..91114f4 100644
--- a/bu
100% means the person was involved in all the commits, in one way or the
other.
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 2 +-
contrib/related/test-related.t | 30 +++---
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a
,7 @@ quick-install-html:
### Maintainer's dist rules
git.spec: git.spec.in GIT-VERSION-FILE
- sed -e 's/@@VERSION@@/$(subst -,~,$(GIT_VERSION))/g' < $< > $@+
+ sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
mv $@+ $@
GIT_TA
Signed-off-by: Felipe Contreras
---
contrib/related/git-related | 85 +
1 file changed, 85 insertions(+)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 6ab74c7..d6b44c7 100755
--- a/contrib/related/git-related
+++ b
Felipe Contreras (20):
merge: simplify ff-only option
t: replace pulls with merges
pull: cleanup documentation
fetch: add missing documentation
remote: fix trivial memory leak
revision: add missing include
shortlog: add missing declaration
branch: trivial style fix
sha1-name
Signed-off-by: Felipe Contreras
---
sha1_name.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sha1_name.c b/sha1_name.c
index 0e5fe7f..e9c2999 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len,
unsigned char *sha1
Signed-off-by: Felipe Contreras
---
builtin/branch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index ad0f86d..5696cf0 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -975,9 +975,8 @@ int cmd_branch(int argc, const char
There's no need to set the default remote name beforehand, only to be
overridden later on, and causing a memory leak, we can do it after the
configuration has been handled.
Signed-off-by: Felipe Contreras
---
remote.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --
ing '--branches --not crap' nothing will come out.
Signed-off-by: Felipe Contreras
---
Documentation/git-rev-parse.txt| 6 +++
contrib/completion/git-completion.bash | 2 +-
revision.c | 54 +++-
revision.h
Signed-off-by: Felipe Contreras
---
builtin/diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/diff.c b/builtin/diff.c
index 2fb8c5d..adb93a9 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -169,7 +169,7 @@ static int builtin_diff_tree(struct rev_info *revs
Signed-off-by: Felipe Contreras
---
builtin/describe.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/describe.c b/builtin/describe.c
index b9d3603..6f62109 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -9,7 +9,7 @@
#include "hash.h"
Otherwise we might not have 'struct diff_options'.
Signed-off-by: Felipe Contreras
---
revision.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/revision.h b/revision.h
index e7f1d21..89132df 100644
--- a/revision.h
+++ b/revision.h
@@ -5,6 +5,7 @@
#include "grep.h"
Signed-off-by: Felipe Contreras
---
Documentation/git-branch.txt | 11 +
branch.c | 43 ++
branch.h | 2 ++
builtin/branch.c | 56
4 files changed, 108
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 35 +++
contrib/related/test-related.t | 13 +
2 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 66c1009
Instead of parsing left to right, do it right do left, this way it is
much more natural and probably efficient too, as there's less
recursivity.
In theory there shouldn't be any functional changes, although there's at
least one error message that has changed.
Signed-off-by: F
No functional changes.
Signed-off-by: Felipe Contreras
---
builtin/merge.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 02a69c1..41fb66d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -186,13 +186,6 @@ static int
Instead of showing the authors and signers, show the commits themselves.
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 23 +++
contrib/related/test-related.t | 10 ++
2 files changed, 33 insertions(+)
diff --git a/contrib/related/git-related b
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 37 +
contrib/related/test-related.t | 14 ++
2 files changed, 51 insertions(+)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index f15e4e7..6ab74c7
No functional changes.
Signed-off-by: Felipe Contreras
---
contrib/related/git-related | 71 +++--
1 file changed, 56 insertions(+), 15 deletions(-)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index ffce839..3cac925 100755
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
---
builtin/b
So replace 'git-foo' with 'git foo'.
Signed-off-by: Felipe Contreras
---
Documentation/git-checkout.txt | 4 ++--
Documentation/git-commit.txt | 4 ++--
Documentation/git-rebase.txt | 4 ++--
Documentation/git-status.txt | 4 ++--
4 files changed, 8 insertions(+),
Signed-off-by: Felipe Contreras
---
builtin/push.c | 35 +++
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index 04f0eaf..5dc06a3 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -113,20 +113,11 @@ static
There's no mention of the 'origin' default, or the fact that the
upstream tracking branch remote is used.
Signed-off-by: Felipe Contreras
---
Documentation/git-fetch.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git-fetch.txt b/Documentation/git-
'origin/master' is very clear, no need to specify the 'remotes/' prefix,
or babysit the user.
Signed-off-by: Felipe Contreras
---
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentatio
Otherwise we would have to include commit.h.
Signed-off-by: Felipe Contreras
---
shortlog.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/shortlog.h b/shortlog.h
index de4f86f..54bc07c 100644
--- a/shortlog.h
+++ b/shortlog.h
@@ -19,6 +19,8 @@ struct shortlog {
struct
Signed-off-by: Felipe Contreras
---
builtin/add.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/add.c b/builtin/add.c
index 226f758..9b30356 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -429,7 +429,7 @@ int cmd_add(int argc, const char **argv, const char
Signed-off-by: Felipe Contreras
---
setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.c b/setup.c
index f08dd64..c717db4 100644
--- a/setup.c
+++ b/setup.c
@@ -566,7 +566,7 @@ static const char *setup_git_directory_gently_1(int
*nongit_ok)
{
const
/fast 177dcad [master, gh/fc/branch/fast] branch: reorganize
verbose options
fc/trivial f289b9a [master: ahead 7] branch: trivial style fix
fc/leaksd101af4 [master: ahead 2] read-cache: plug a possible leak
stable e230c56 Git 1.8.4
Felipe Contreras (8):
branch
reshold of participation.
For example:
% git related 0001-remote-hg-trivial-cleanups.patch
Felipe Contreras
Jeff King
Max Horn
Junio C Hamano
Thus it can be used for 'git send-email' as a cc-cmd.
There might be some other related functions to this script, not just to
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 15 +++
contrib/related/test-related.t | 10 ++
2 files changed, 25 insertions(+)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 4f78304..80e1f17 100755
--- a/contrib/related
Not just the root one (of the project).
Signed-off-by: Felipe Contreras
---
contrib/related/git-related | 6 ++
1 file changed, 6 insertions(+)
diff --git a/contrib/related/git-related b/contrib/related/git-related
index 3399307..f15e4e7 100755
--- a/contrib/related/git-related
+++ b
Signed-off-by: Felipe Contreras
---
t/t3200-branch.sh | 76 +++
1 file changed, 76 insertions(+)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 44ec6a4..cd0b8e9 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -870,4 +870,80
The upstream branch is:
branch.$name.remote
branch.$name.merge
The publish branch is:
branch.$name.pushremote
branch.$name.push
Signed-off-by: Felipe Contreras
---
builtin/push.c | 19 +++
remote.c | 34 --
remote.h | 4
This is what the code intended.
No functional changes.
Signed-off-by: Felipe Contreras
---
t/annotate-tests.sh| 2 +-
t/t4200-rerere.sh | 2 +-
t/t9114-git-svn-dcommit-merge.sh | 2 +-
t/t9500-gitweb-standalone-no-errors.sh | 2 +-
4 files changed
Instead of showing the total involvement, show it per role: author, or
signer.
Signed-off-by: Felipe Contreras
---
contrib/related/git-related| 18 +-
contrib/related/test-related.t | 30 +++---
2 files changed, 28 insertions(+), 20 deletions(-)
diff
Synonym for --index.
Signed-off-by: Felipe Contreras
---
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..ce44327 100644
--- a
dify, or not, the working directory.
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 Contrer
Signed-off-by: Felipe Contreras
---
builtin/symbolic-ref.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index f481959..71286b4 100644
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -47,7 +47,7 @@ int
Signed-off-by: Felipe Contreras
---
builtin/branch.c | 52 +++-
1 file changed, 43 insertions(+), 9 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index cf33e1c..9f15f7e 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -42,6
user lucky enough to find the 'fetch.default' configuration,
however, would never have to enter the word of "local remote"
strangeness, and would remain comfortably in the place where locals are
locals, and remotes are remotes, and 'git fetch' is always consisten
Signed-off-by: Felipe Contreras
---
contrib/related/README | 65 ++
1 file changed, 65 insertions(+)
create mode 100644 contrib/related/README
diff --git a/contrib/related/README b/contrib/related/README
new file mode 100644
index 000
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index ed3384e..46b3e57 100644
--- a/transport-helper.c
+++ b
Signed-off-by: Felipe Contreras
---
run-command.c | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/run-command.c b/run-command.c
index 1b7f88e..3914d9c 100644
--- a/run-command.c
+++ b/run-command.c
@@ -406,13 +406,12 @@ fail_pipe
Signed-off-by: Felipe Contreras
---
pretty.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pretty.c b/pretty.c
index b4e32b7..962e82b 100644
--- a/pretty.c
+++ b/pretty.c
@@ -497,7 +497,7 @@ void pp_user_info(struct pretty_print_context *pp,
static int is_empty_line(const
801 - 900 of 3330 matches
Mail list logo
