Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
[...]
don't forget to Cc Junio if
you think your patch is ready for inclusion.
Heh, thanks. Everybody seems to think anything they send out to the
list is ready for inclusion, so the last part may
On Tue, Feb 04, 2014 at 11:20:39AM +0100, Daniel Hahler wrote:
Hi,
when using a submodule sm, there is a relative worktree in its config:
.git/modules/sm/config:
[core]
worktree = ../../../smworktree
git-new-worktree (from contrib) symlinks this config the new worktree.
Good morning,
when diffing output where files have CRLF line ending, the coloring
seems wrong, because in changed lines the CR (^M) is highlighted,
even if the line ending has not changed.
The diff engine itself is correct.
I added a test case to show this behaviour.
The problem seems to come
From: Junio C Hamano gits...@pobox.com
Christian Couder chrisc...@tuxfamily.org writes:
+enum action_where { WHERE_AFTER, WHERE_BEFORE };
+enum action_if_exist { EXIST_ADD_IF_DIFFERENT,
EXIST_ADD_IF_DIFFERENT_NEIGHBOR,
+ EXIST_ADD, EXIST_OVERWRITE, EXIST_DO_NOTHING };
From: Junio C Hamano gits...@pobox.com
Christian Couder chrisc...@tuxfamily.org writes:
+enum action_if_exist if_exist;
+enum action_if_missing if_missing;
Probably if_exists is more gramatically correct.
if (x-if_exists) {
... do this ...
}
would
From: Junio C Hamano gits...@pobox.com
Christian Couder chrisc...@tuxfamily.org writes:
+static void apply_arg_if_exist(struct trailer_item *infile_tok,
+ struct trailer_item *arg_tok,
+ int alnum_len)
+{
+switch
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH v4 10/17] trailer: if no input file is passed, read from
stdin
Date: Thu, 06 Feb 2014 13:51:36 -0800
Christian Couder chrisc...@tuxfamily.org writes:
It is simpler and more natural if the git interpret-trailers
is made a filter as
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH v5 04/14] trailer: process command line trailer arguments
Date: Thu, 06 Feb 2014 16:08:24 -0800
Christian Couder chrisc...@tuxfamily.org writes:
This patch parses the trailer command line arguments
and put the result into an arg_tok
Signed-off-by: Sup Yut Sum ch3co...@gmail.com
---
contrib/completion/git-completion.bash | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 9525343..87de809 100644
---
On Feb 8, 2014, at 10:19 PM, Dongsheng Song wrote:
On Sun, Feb 9, 2014 at 12:29 AM, Andrew Keller and...@kellerfarm.com wrote:
On Feb 8, 2014, at 8:37 AM, Dongsheng Song wrote:
I have an git repo PROJECT.git, the full path is /srv/repo/git/PROJECT.git,
when I set git_base_url_list in
From: POJAR GEORGE geoubu...@gmail.com
Signed-off-by: POJAR GEORGE geoubu...@gmail.com
---
Documentation/video4linux/CARDLIST.saa7134 | 1 +
drivers/media/pci/saa7134/saa7134-cards.c | 51 ++-
drivers/media/pci/saa7134/saa7134-input.c | 62 +
Hello,
I recently started to use git and now are digging through more and more
of the low level details.
What I recently tried was to do this for a repository created by Bob:
git remote add -t for_bob anna url
So setup a remote (created by anna) for which a branch called
for_bob is fetched.
Am 09.02.2014 12:01, schrieb Stefan-W. Hahn:
Good morning,
when diffing output where files have CRLF line ending, the coloring
seems wrong, because in changed lines the CR (^M) is highlighted,
even if the line ending has not changed.
...
If WS_CR_AT_EOL is set in ecbdata-ws_rule, it works
On 2014-02-08 09.53, Duy Nguyen wrote:
Thanks for the comments. I can see I now have some work to do in the
coming weeks :)
file-watcher.c | 32
1 file changed, 32 insertions(+)
I feel a little bit unsure about the 700.
Most often
On 2014-02-06 12.24, Reuben Hawkins wrote:
[snipped away minor interesting stuff]
Reading the answers from Peff and Junio, I am convinced that the
fast-import should
not look at core.ignorecase at all.
Agreed, but my patch 0001-fast-import.c-ignorecase-iff-... is working very well
This series was posted to the list some time back. This is a re-send of
Nicolas Vigier's work with an additional patch that adds --gpg-sign to
pull as well, as well as the fixes that Junio suggested in review for
v3.
There is also one additional merge call that was not previously given a
From: Nicolas Vigier bo...@mars-attacks.org
There is no functional change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-am.sh |
From: Nicolas Vigier bo...@mars-attacks.org
The -M option does not exist in OPTIONS_SPEC, so there is no use to try
to find it.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-rebase.sh | 2 +-
1 file changed, 1
From: Nicolas Vigier bo...@mars-attacks.org
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse
option parsing is done in --stuck-long mode.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
contrib/git-resurrect.sh
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-am.txt | 6 +-
git-am.sh| 9 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
git-pull.sh | 13
From: Nicolas Vigier bo...@mars-attacks.org
Remove a check on the number of arguments for --onto and -x options.
It is not possible for $# to be = 2 at this point :
- if --onto or -x has an argument, git rev-parse --parseopt will
provide something like this :
set -- --onto 'x' --
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-cherry-pick.txt | 7 ++-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 2
From: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
Documentation/git-rebase.txt | 4
git-rebase--am.sh| 8 +---
git-rebase--interactive.sh | 39
From: Nicolas Vigier bo...@mars-attacks.org
There is no functionnal change. The reason for this change is to be able
to add a new option taking an optional argument.
Signed-off-by: Nicolas Vigier bo...@mars-attacks.org
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net
---
On Sat, Feb 08, 2014 at 10:47:16PM +0100, Thomas Rast wrote:
Jeff King p...@peff.net writes:
The current scheme for getting build-time variables into a
shell script is to munge the script with sed, and stick the
munged variable into a special sentinel file so that make
knows about the
On Sun, Feb 09, 2014 at 06:48:18AM +0700, Duy Nguyen wrote:
I guess by quoting you meant:
echo 'trailing ' .gitignore
This makes special. If we follow shell convention then things
between .. should be literal (e.g. * is no longer a wildcard). We
don't support it yet. So I rather go
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Trailing spaces are invisible in most standard editors (*). git diff
does show trailing spaces by default. But that does not help newly
written .gitignore files. And trailing spaces are the source of
frustration when writing .gitignore.
So
On Mon, Feb 10, 2014 at 11:07 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Trailing spaces are invisible in most standard editors (*). git diff
does show trailing spaces by default. But that does not help newly
written .gitignore files. And
Junio C Hamano gits...@pobox.com writes:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Trailing spaces are invisible in most standard editors (*). git diff
does show trailing spaces by default. But that does not help newly
written .gitignore files. And trailing spaces are the source of
On Sun, Feb 9, 2014 at 8:03 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
From: Nicolas Vigier bo...@mars-attacks.org
There is no functionnal change. The reason for this change is to be able
s/functionnal/functional/
to add a new option taking an optional argument.
On Thu, Feb 6, 2014 at 3:20 PM, Christian Couder
chrisc...@tuxfamily.org wrote:
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
diff --git a/Documentation/git-interpret-trailers.txt
b/Documentation/git-interpret-trailers.txt
new file mode 100644
index 000..0617941
---
On Sun, Feb 9, 2014 at 8:48 AM, Christian Couder
chrisc...@tuxfamily.org wrote:
From: Junio C Hamano gits...@pobox.com
Christian Couder chrisc...@tuxfamily.org writes:
+static inline int same_trailer(struct trailer_item *a, struct trailer_item
*b, int alnum_len)
+{
+return
Hi Jens,
So git status says:
liptak@liptak-kubuntu:~/Projects/MAIN_MODULE/platform/SUBMODULE
[master]$ git status
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes not staged for commit:
# (use git add file... to update what will be committed)
# (use git
34 matches
Mail list logo
