Re: git:// protocol over SSL/TLS

secure anonymous checkout is to simply use https:// ? Yes. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git

Re: git:// protocol over SSL/TLS

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- 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

Re: [PATCH] Improve user-manual html and pdf formatting

, Jonathan That's a Unicode Byte Order Mark. No, its an ampersand, a hash, a number and a semicolon. Definitely not a BOM. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different

Re: [PATCH] pager: set LV=-c alongside LESS=FRSX

$LESS should start with a dash (there are examples with and without it). Implementation-wise, less uses the same function to process an option argument (including the leading dash) and the value of $LESS, so the form with the leading dash is probably preferred. Andreas. -- Andreas Schwab, sch

Re: Creating own hierarchies under $GITDIR/refs ?

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: git gc --aggressive led to about 40 times slower git log --raw

git mirror since bzr doesn't keep that distinction (and cvs didn't either). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line

Re: Testing for commit reachability through plumbing commands

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: git merge --date --author

Yann Droneaud ydrone...@opteya.com writes: But I'd like to know if there's a specific reason for git merge to not support --date and --author ? It's rather unusual that a merge is performed on behalf of a different author. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key

Re: howto to run git without a master branch

/name resolves to, ie. without explicit branch name. (The only command that manipulates the remote repository is git push, and the plumbing beneath that. To change HEAD in a remote repository you need filesystem access to it.) Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint

[PATCH] Add grep.fullName config variable

This configuration variable sets the default for the --full-name option. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Documentation/git-grep.txt | 3 +++ grep.c | 5 + 2 files changed, 8 insertions(+) diff --git a/Documentation/git-grep.txt b/Documentation/git

Re: Committing a change from one branch another branch

Jagan Teki jagannadh.t...@gmail.com writes: How can we do this, any idea? git cherry-pick Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list

[PATCH] Add grep.fullName config variable

This configuration variable sets the default for the --full-name option. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Documentation/git-grep.txt | 3 +++ grep.c | 5 + 2 files changed, 8 insertions(+) diff --git a/Documentation/git-grep.txt b/Documentation/git

Re: [PATCH] Add grep.fullName config variable

Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: This configuration variable sets the default for the --full-name option. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Would this change break Porcelains (e.g. Emacs modes) and force them

Re: [PATCH] Add grep.fullName config variable

Junio C Hamano gits...@pobox.com writes: Don't we have the exact same issue for the editor, by the way? Shouldn't we be running it in the original subdirectory as well? It's called with an absolute name, so it shouldn't care. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key

Re: [PATCH] Add grep.fullName config variable

Andreas Schwab sch...@linux-m68k.org writes: Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: This configuration variable sets the default for the --full-name option. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Would this change break

Re: [PATCH v3] MSVC: fix t0040-parse-options crash

? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH v3] MSVC: fix t0040-parse-options crash

to unsigned long. Wouldn't it make sense to change defval into a union to avoid the cast? (The intptr_t type may be too narrow for other values to be put there.) Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: [PATCH] tag: add -i and --introduced modifier for --contains

is only a few commits longer than v3.5-rc1~120^3~76^2. Andreas. -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] tag: add -i and --introduced modifier for --contains

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH 1/9] Define a structure for object IDs.

. It is perfectly compliant (and even reasonable) to make struct object_id require 8 byte alignment, adding 4 bytes of padding at the end. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different

Re: [PATCH 1/9] Define a structure for object IDs.

brian m. carlson sand...@crustytoothpaste.net writes: I don't even plan to write the code assuming that offsetof(struct object_id, oid) is 0. This is guaranteed by the C standard, though. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3

Re: [PATCH 1/9] Define a structure for object IDs.

David Kastrup d...@gnu.org writes: Andreas Schwab sch...@linux-m68k.org writes: brian m. carlson sand...@crustytoothpaste.net writes: I don't even plan to write the code assuming that offsetof(struct object_id, oid) is 0. This is guaranteed by the C standard, though. Any reference

Re: [PATCH 1/9] Define a structure for object IDs.

David Kastrup d...@gnu.org writes: Andreas Schwab sch...@linux-m68k.org writes: David Kastrup d...@gnu.org writes: Andreas Schwab sch...@linux-m68k.org writes: brian m. carlson sand...@crustytoothpaste.net writes: I don't even plan to write the code assuming that offsetof(struct

Re: [PATCH 1/9] Define a structure for object IDs.

padding, it doesn't have to be minimal. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH 1/9] Define a structure for object IDs.

an object of struct type then any pointer to the first member of the object can only be a pointer to the one and same object. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different

Re: [PATCH 1/9] Define a structure for object IDs.

object_id, and it's irrelevant to this thread. This thread is about objects of type struct object_id, and their address is always the same as the address of its first member. Nothing else is relevant. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B

Re: push from one remote to another

/linux.git # git remote add --tags o g...@github.com:user/repo.git # git fetch --all This syntax does not work for me: # git push t master o master # git push --tags t master o master $ git push o remotes/t/master:master Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

Steffen Prohaska proha...@zib.de writes: The test should confirm that the the file that is added is not mmapped to memory. RSS doesn't tell you that. You can mmap a big file without RSS getting bigger. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53

Re: [PATCH v2 2/2] convert: Stream from fd to required clean filter instead of mmap

Steffen Prohaska proha...@zib.de writes: On Aug 16, 2014, at 7:00 PM, Andreas Schwab sch...@linux-m68k.org wrote: Steffen Prohaska proha...@zib.de writes: The test should confirm that the the file that is added is not mmapped to memory. RSS doesn't tell you that. You can mmap a big

Re: git merge --abort deletes unstaged files

André Hänsel an...@webkr.de writes: I ran git merge to merge a branch. There were some conflicted files. Although they were automatically resolved by git rerere, I still had to add them. If you want them to be added automatically, set rerere.autoupdate=true. Andreas. -- Andreas Schwab, sch

Re: git merge --abort deletes unstaged files

Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: André Hänsel an...@webkr.de writes: I ran git merge to merge a branch. There were some conflicted files. Although they were automatically resolved by git rerere, I still had to add them. If you want

Re: git merge --abort deletes unstaged files

Junio C Hamano gits...@pobox.com writes: On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab sch...@linux-m68k.org wrote: Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: André Hänsel an...@webkr.de writes: I ran git merge to merge a branch. There were

Re: [PATCH v3] git tag --contains: avoid stack overflow

--contains HEAD actual [ 492s] # test_cmp expect actual [ 492s] # [ 492s] # failed 1 among 136 test(s) [ 492s] 1..136 [ 492s] Makefile:44: recipe for target 't7004-tag.sh' failed [ 492s] make[2]: *** [t7004-tag.sh] Error 1 Andreas. -- Andreas Schwab, sch...@linux

Re: [PATCH v3] git tag --contains: avoid stack overflow

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH v3] Handle atexit list internaly for unthreaded builds

Etienne Buira etienne.bu...@gmail.com writes: +#define tmp_atexit atexit +#define atexit tmp_atexit +#undef tmp_atexit What is this supposed to do? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: Feature Proposal: Track all branches from a given remote

), execute the git pull command, and then reset the configuration after the command finished. There is no need to modify the configuration, you can pass the fetch spec on the command line. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5

Re: flatten-merge history

rewritten, the branches b1 and b2 no longer refer to 'master'. Branch b2, for example, still branches off at B and not B'. You only rebased master, so b1 and b2 were unchanged. If you want to change b1 and b2 you have to rebase them as well. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG

Re: flatten-merge history

Henning Moll newssc...@gmx.de writes: Just a final question: Is it possible to keep the GIT_COMMITTER_DATE in all those rebases? If you want that you need to work with git filter-branch. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3

Re: Editing git changelog automatically

, though. I know I can change $EDITOR to something like `sed -e 's/foo/bar/'`, but this seems pretty ugly. Is there a clean way to do that? I don't see the ugliness. There is no requirement that $EDITOR is interactive. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint

Re: [RFC/PATCH] Add the NO_SENTINEL build variable

is GCC 4.0.4, so it is not clear if 4.0 had it, or it was added somewhere between 4.0 and 4.0.4 to me. Generally, gcc doesn't get new features added within the same minor version, only bug fixes. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756

Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: Git tag output order is incorrect (IMHO)

Rahul Bansal rahul.ban...@rtcamp.com writes: IMHO git tag is expected to show tag-list ordered by versions. A git tag can be anything, not related to versions at all. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5

Re: [RFC] Delete current branch

Ramkumar Ramachandra artag...@gmail.com writes: # er, what was the branch name again? $ git checkout - You could take a look in the reflog. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

Re: [PATCH] builtins: search builtin commands via binary search.

\ rm builtin.expect builtin.actual \ } You need a semicolon before the closing }. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from

Re: [PATCH 03/13] contrib/subtree: Better Error Handling for add

hasn't been fetched yet, so it can never be verified against the local repository. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send

Re: change remote to track new branch

-to to change the upstream of a branch (or create a new branch from the new upstream). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line

Re: change remote to track new branch

Daniel Convissor dani...@analysisandsolutions.com writes: Thanks. Those commands were introduced in 1.8. Is there a way to do it in 1.7, please? Use git config. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5

Re: git status resets permissions on index file -- Ubuntu 12.04 64b

Justin Collum jcol...@gmail.com writes: sudo chmod 644 ./.git/index That doesn't make sense. If you are the owner of the file, why do you need sudo??? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: [PATCH v4] gc: reject if another gc is running, unless --force is given

are used for denoting process groups in various interfaces. No process can have a negative pid. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list

Re: git should not use a default user.email config value

Jeff King p...@peff.net writes: So if I understand your use case, then you would be even happier if rather than giving a warning, git simply barfed and said please set your identity before committing? FWIW, this is what both hg and bzr do. Andreas. -- Andreas Schwab, sch...@linux-m68k.org

Re: How can I automatically create a GIT branch that represents a sequence of tags?

on using tags as bounds. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: ephemeral-branches instead of detached-head?

behind, not connected to any of your branches: 0e3618e a Switched to branch 'master' Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send

Re: [PATCH] CET is only one hour ahead of UTC, it even says so in date.c

`. RFC 2822:: The standard email format as described by RFC 2822, for example - `Thu, 07 Apr 2005 22:13:13 +0200`. + `Thu, 07 Apr 2005 22:13:13 +0100`. This timestamp cannot be in the CET timezone, though. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint

Re: CPPCheck found 24 high risk bugs in Git v.1.8.3.4

and str may trap after realloc has freed the original pointer), it is better to calculate the difference before calling realloc. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different

Re: CPPCheck found 24 high risk bugs in Git v.1.8.3.4

of segmented architectures, where freeing a pointer invalidates its segment, so that even loading the value of the pointer traps. Probably no such architecture is in use any more, though. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276

Re: Issue with compiling git 1.8.4 under uclibc with gcc 4.6.3

places were changes, it compiled successfully. Sounds like a parser bug to me. No, it isn't. fgetc may be a function-like macro that expands to an arbitrary expression (same for ungetc or ftell, or any other indentifier that matches a C library function, for that matter). Andreas. -- Andreas

Re: git fetch --reference

Yann Droneaud ydrone...@opteya.com writes: So what's the best way to do a git fetch remote, copying objects from another local repository to resolve delta ? IMHO the best way is to add a remote for the local repository, fetch from it, then fetch from remote. Andreas. -- Andreas Schwab, sch

[PATCH] Documentation/git-merge.txt: fix formatting of example block

You need at least four dashes in a line to have it recognized as listing block delimiter by asciidoc. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Documentation/git-merge.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-merge.txt b

Re: PATCH] Allow git-filter-branch to process large repositories with lots of branches.

$@) - case $filter_subdir in ) eval set -- $(git rev-parse --sq --no-revs $@) Here the arguments are reset. @@ -267,8 +265,9 @@ case $filter_subdir in ;; esac +git rev-parse --revs-only $@ | \ So this is using a different argument list than before. Andreas. -- Andreas Schwab

Re: Git: Having trouble merging two repositories by interweaving their histories

. To get a meaningful result this requires that both repositories have a completely linear history. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from

Re: git diff vs git diff-files

GIT_PAGER=xxd git -p diff diff-hexdump etc. to ensure that git takes the same code paths as when writing to less. Or use script(1). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

Re: [PATCH] Fallback on getpwuid if envar HOME is unset

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: exporting a .git file ?

Aaron Gray aaronngray.li...@gmail.com writes: I realize that but I wanted to distribute it as a downloadable file without having to use a server. git bundle can create a single file from the object database. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7

Re: 'git --grep' doesn't grep notes?

Todd A. Jacobs nospam+listm...@codegnome.org writes: What is the right way to include notes in log searches, especially if the end goal is to find the related commit ID? You can git grep on refs/notes/commits and s,/,,g on the file name found. Andreas. -- Andreas Schwab, sch...@linux

Re: (minor concern) git using the pager should not be a default

would page by default. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: Grafting Alternate History

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- 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

Re: Should GIT_AUTHOR_{NAME,EMAIL} set the tagger name/email?

tag-name-2 The tagger is controlled by the committer info. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git

Re: Should GIT_AUTHOR_{NAME,EMAIL} set the tagger name/email?

Ævar Arnfjörð Bjarmason ava...@gmail.com writes: I don't get what you mean, what committer info? GIT_COMMITTER_{NAME,EMAIL}. A tagger isn't really an author. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: diff/merge tool that ignores whitespace changes

Enrico Weigelt enrico.weig...@vnc.biz writes: * git-diff or git-format-patch or tig should not show differences that are only whitespace changes (eg. differing linefeeds or tabs vs. spaces, changed indentions, etc) --ignore-all-space Andreas. -- Andreas Schwab, sch...@linux-m68k.org

Re: [PATCH] ls-remote: document the '--get-url' option

this isn't a subcommand of git remote.) Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [BUG?] git rebase not accepting :/ syntax

due to the unlimited nature of :/ doesn't work. OTOH, git rebase -i HEAD^{/Merge} does work, and rev-parse resolves it to the same commit. OTOH, git rev-parse HEAD^{/Merge}^0 works as expected. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756

Re: Keeping two repos in sync

Add bsd as a remote in portable and cherry-pick each commit in bsd. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe

Re: Keeping two repos in sync

anyway -- that graft represents a way of tieing the branches together at a point I can then git merge. You can git merge -s ours that grafting point, assuming portable completely subsumes bsd at that point. Future merges should then be working normally. Andreas. -- Andreas Schwab, sch...@linux

Re: git checkout -b following git reset --hard pitfall

. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: Remove all files except a few files, using filter-branch

' ' ') Try instead first removing all files, then restoring the files you want to keep. --index-filter git rm --cached -qr -- . git reset -q -- filename Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

[PATCH] Documentation/git-filter-branch: Move note about effect of removing commits

The note that explains that changes introduced by removed commits are preserved should be placed directly after the paragraph that describes such commits removal. Otherwise the reference to the commits appears out of context. Signed-off-by: Andreas Schwab sch...@linux-m68k.org --- Documentation

Re: Quickly searching for a note

of revisions: git rev-list --max-count=1000 I iterate those revisions and run git show and grep on each: git show -s --format=%N%n%s --show-notes=p4notes COMMIT How about git grep P4@123456 notes/p4notes? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint

Re: Unable to clone GIT project

That doesn't solve the mystery why you need libiconv in the first place. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line

Re: [PATCH] t/test-lib.sh: do not trust $SHELL

Jeff King p...@peff.net writes: A bigger question is: why are you setting SHELL=zsh in the first place? SHELL is set to the login shell by default. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

Re: [PATCH] t/test-lib.sh: do not trust $SHELL

to /bin/sh. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org

Re: GIT_DIR vs. --git-dir

. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: GIT_DIR vs. --git-dir

arg=~/foo even though a POSIX shell wouldn't tilde expand it. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git

Re: bash completion with colour hints

is consistent with ordinary expansion). Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH] gitk: refresh the index before running diff-files

: catch { exec git update-index --refresh } Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH] gitk: refresh the index before running diff-files

Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: On Sat, Sep 29, 2012 at 12:11:58AM +0200, Andreas Schwab wrote: Jeff King p...@peff.net writes: +proc refresh_index {} { +global need_index_refresh +if { $need_index_refresh } { + exec sh -c git update

Re: erratic behavior commit --allow-empty

Angelo Borsotti angelo.borso...@gmail.com writes: The user adds --allow-empty to have a different unique commit Where does the manual say that --allow-empty implies a different and unique commit? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B

Re: erratic behavior commit --allow-empty

Angelo Borsotti angelo.borso...@gmail.com writes: By reading: the command prevents I understand that a new commit is not created, and This option bypasses that it is instead created. But where does it say different and unique? Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key

Re: erratic behavior commit --allow-empty

Angelo Borsotti angelo.borso...@gmail.com writes: it does not state plainly that no commit object is created. But the commit object _is_ created, it just doesn't have a unique name. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5

Re: git reset respect remote repo (make git idiot proof)

repository, because if I continue No you didn't. // do changes git commit -mgood1 git push origin master // fails because the history disrespects the remote repo's history You may just as well want to push it to a different branch (or even a different repository). Andreas. -- Andreas Schwab

Re: erratic behavior commit --allow-empty

Angelo Borsotti angelo.borso...@gmail.com writes: that after the command there are no new objects. That is an uninteresting implementation detail. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

Re: erratic behavior commit --allow-empty

on the parent, message, author and date. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: erratic behavior commit --allow-empty

are present in the repository after the command execution as they were before it. That is just an implementation detail. All you need to know is that a ref has been created or modified. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B

Re: What's cooking in git.git (Oct 2012, #01; Tue, 2)

Junio C Hamano gits...@pobox.com writes: When we require x/**/y, I think we still want it to match x/y. FWIW, in bash (+extglob), ksh and zsh it doesn't. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: What's cooking in git.git (Oct 2012, #01; Tue, 2)

Matthieu Moy matthieu@grenoble-inp.fr writes: Andreas Schwab sch...@linux-m68k.org writes: Junio C Hamano gits...@pobox.com writes: When we require x/**/y, I think we still want it to match x/y. FWIW, in bash (+extglob), ksh and zsh it doesn't. You're right about bash, but I see

Re: git checkout error

/origin/master Switched to a new branch 'topic' You can also specify --no-track after -b (and its argument): $ git checkout -b topic --no-track remotes/origin/master Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: username case conflict in git svn clone

David Balch david.ba...@conted.ox.ac.uk writes: whenusers.txt contains: juser Joe User joe.u...@example.com JUser Joe User joe.u...@example.com Reread the manual. Hint: there must be an equal sign. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53

Re: Inconsistency in specifying commit path for git diff

Arthur Etchells adetche...@gmail.com writes: git diff commit:path..commit:path commit:path represents a tree or blob, but .. requires commits as its end points. (You can dereference a commit to get a tree or blob, but not the other way round.) Andreas. -- Andreas Schwab, sch...@linux

Re: git svn clone options

乙酸鋰 ch3co...@gmail.com writes: Could you clarify --branch option, is it the same as --branches. Switches can be abbreviated as long as they are unambiguous. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now

Re: rm and add, but not rename, of identical files

. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: How can I tell if anything was fetched?

-ref') to reliably detect any changes. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

  1   2   3   >