Rebase with remote branch?

I have two branches, 'master' and 'work'. 'master' I never work out of, and I merge changes into it from another SVN repository (I do not use git-svn, I do this all by hand as real git commits). My 'work' branch is technically my 'master' in the git-trunk sense, as that is my personal main line of

How to get notified of new releases?

Are there any dedicated mailing lists for git releases, or RSS feeds? I am on Windows so I'd specifically be interested in notifications when new releases or preview binaries are released on the Windows platform. I'm constantly checking the website currently. -- To unsubscribe from this list: send

Re: Wrong version of Git on your download website for windows

I looked into this and they seem to be deliberately holding off onto a release due to some max path issues on Windows: https://github.com/msysgit/git/pull/122 Also there are some unofficial builds for 1.8.5.4 I think, you just have to Google for it. On Mon, Feb 17, 2014 at 9:45 AM, Dr. Torsten

git-svn fetch after tag conversion?

I'm converting a large SVN repository to a Git repository. I've run the first step of `git svn fetch` and now I have all of my branches, tags, and trunk. However my tags are still just branches, I have not converted them yet. As I transition my team over to use Git, I wonder if it is possible to

Cygwin + git log = no pager!

So it seems that the pager doesn't work by default when running `git log` from Cygwin like it does in msysgit for Windows. I know I can pipe to `less` but that requires the additional typing obviously. Does anyone know how I can get the pager to work in Cygwin for git log, reflog, and other

Re: Cygwin + git log = no pager!

On Sat, Feb 22, 2014 at 1:39 AM, Chris Packham judge.pack...@gmail.com wrote: On 22/02/14 18:18, Robert Dailey wrote: So it seems that the pager doesn't work by default when running `git log` from Cygwin like it does in msysgit for Windows. I know I can pipe to `less` but that requires

Re: Cygwin + git log = no pager!

On Mon, Feb 24, 2014 at 3:06 AM, Jeff King p...@peff.net wrote: On Mon, Feb 24, 2014 at 08:55:41PM +1300, Chris Packham wrote: Thanks for the response. I did set this environment variable in my .bashrc like so: export GIT_PAGER=less However after I do a 'git log' it is just spitting

Re: Can't use difftool to selectively revert changes

to my working copy version but that's wrong. Sorry for the superfluous post! On Tue, Feb 25, 2014 at 9:22 AM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a branch called topic1 that is based on 'master'. For a particular file in my topic branch, I want to revert some changes by using my

Can't use difftool to selectively revert changes

I have a branch called topic1 that is based on 'master'. For a particular file in my topic branch, I want to revert some changes by using my diff tool. I do this by comparing the original revision of the file with HEAD like so: $ git difftool $(git merge-base topic1 master) HEAD --

Re: Cygwin + git log = no pager!

On Wed, Feb 26, 2014 at 3:26 AM, Jeff King p...@peff.net wrote: On Mon, Feb 24, 2014 at 01:34:34PM -0600, Robert Dailey wrote: So I set GIT_PAGER to 'echo custom pager' as you instructed, and I noticed that wasn't being printed when I ran my git log alias. So what I did after that was set

Re: Cygwin + git log = no pager!

Copying the patch from the email text results in corrupted patch, something isn't quite right with it so it won't let me apply it. Can you attach it as an actual file so I can try again? Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Compiling git for Windows

Oddly I'm not able to find any instructions on how to build Git for Windows. I've done a clone of the repository here: https://github.com/msysgit/git I did attempt to try doing it myself. I installed 'make' and mingw-gcc in Cygwin and attempted 'make' from the git directory but it fails

msysgit color scheme

Is there a way to change color scheme in msysgit without going through the Properties Colors settings? Reason I ask is because I share the same HOME directory and .bashrc file between msysgit and cygwin, and it'd be nice to use the same color scheme defined in the bashrc between both. Any tips?

Rewriting git history during git-svn conversion

Hi, I am converting my team's SVN server to GIT but they aren't ready to transition yet. People are still working out of SVN, so I need to keep the git-svn clone around to do 'git svn fetch' to continue to keep it synchronized with SVN. Once everyone is ready to switch, and after converting all

Unable to shrink repository size

I have a git-svn clone that I've been working on which is a full and complete conversion of our SVN repository at work. It started out as 1.4GB (git count-objects -v, looking at 'size-pack'). I have run the following script to clean up a directory in the repo history that I suspect are huge (we

Re: Rewriting git history during git-svn conversion

On Tue, Mar 4, 2014 at 4:56 AM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Mon, Mar 3, 2014 at 7:38 PM, Robert Dailey rcdailey.li...@gmail.com wrote: Is it safe to do this while still using git svn fetch? Will it properly continue to convert SVN commits on top of my rewritten

Re: Lost commit during rebase!

Dailey rcdailey.li...@gmail.com wrote: I have a local-only branch with just under 70 commits. I also have merge commits on this branch. The log of the top few commits on my branch looks like so: * de651ff (20 minutes ago) (HEAD, survey) Robert Dailey - WIP: GOTO implementation

git log for only certain branches

I have more details about my inquiry on StackOverflow: http://stackoverflow.com/questions/22823768/view-git-log-with-merges-for-only-certain-branches Basically I'd like to know if it is possible to show the graph for ONLY branches that I list. The key here is that the graph should also show

Re: git log for only certain branches

On Tue, Apr 8, 2014 at 12:08 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Robert Dailey rcdailey.li...@gmail.com writes: I have more details about my inquiry on StackOverflow: http://stackoverflow.com/questions/22823768/view-git-log-with-merges-for-only-certain-branches Basically I'd

How to trim the fat on my log graphs

My log graphs are pretty insane sometimes because we converted our repo from SVN and haven't had a chance to delete all of the remote branches. We still have quite a few (maybe 20). When I do `git log`, I am shown about 10-15 vertical lines and the branch I currently have checked out isn't even

Re: How to trim the fat on my log graphs

Thanks, removing those two options did help quite a bit already. However, the history can still get pretty crazy. Is there a way to hide all tags from the log graph? Really I just want the LABELS to be hidden. On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey

Re: How to trim the fat on my log graphs

On Wed, Apr 23, 2014 at 12:30 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: [Administrivia: because people read from top to bottom / why is it bad to top-post? / please do not top-post.] On Tue, Apr 22, 2014 at 4:37 PM, Junio C Hamano gits

Bash v4 on msysgit?

How can I get Bash v4 for msysgit 1.9.2? I need it for 'globstar' shopt support. Thanks in advance. -- 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

Re: Bash v4 on msysgit?

Thanks for the info. Really quite disappointing that the discussion linked was from 3 years ago but still no progress. I wish I could use cygwin to use GIT but LESS doesn't work for log, reflog, and other commands. On Fri, May 9, 2014 at 4:37 AM, Thomas Braun thomas.br...@virtuell-zuhause.de

Git showing tags in logs when it shouldn't

I have run the following command: log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset)%x09%C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset) %C(dim white)%an%C(reset) - %C(white)%s%C(reset)' After running this, I am seeing tag labels in the log

Relative submodule URLs

The documentation wasn't 100% clear on this, but I'm assuming by remote origin, it says that the relative URL is relative to the actual remote *named* origin (and it is not using origin as just a general terminology). Is there a way to specify (on a per-clone basis) which named remote will be

Re: Relative submodule URLs

On Mon, Aug 18, 2014 at 3:55 PM, Jonathan Nieder jrnie...@gmail.com wrote: Thanks for reporting. The remote used is the default remote that git fetch without further arguments would use: get_default_remote () { curr_branch=$(git symbolic-ref -q HEAD)

Re: Relative submodule URLs

On Tue, Aug 19, 2014 at 5:24 AM, Heiko Voigt hvo...@hvoigt.net wrote: I think the OP problem stems from him having a branch that does not have a remote configured. Since they do not have 'origin' as a remote and git submodule update --init --recursive path/to/submodule fails. Right?

Re: Relative submodule URLs

On Tue, Aug 19, 2014 at 11:39 AM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: The way I set up my remote tracking branch will be different for each of these commands: - git pull :: If I want convenient pulls (with rebase), I will track my upstream

Re: Relative submodule URLs

On Tue, Aug 19, 2014 at 2:19 PM, Junio C Hamano gits...@pobox.com wrote: I do not know if that is how GitHub teaches people, but I would have to say that these are strange phrasing. I suspect that part of their documentation was written long time ago, back when nobody on the GitHub side were

Re: Re: Relative submodule URLs

On Tue, Aug 19, 2014 at 2:30 PM, Heiko Voigt hvo...@hvoigt.net wrote: Well the remote for the submodule is currently only calculated once, when you do the initial git submodule update --init that clones the submodule. Afterwards the fixed url is configured under the name 'origin' in

Re: Re: Re: Relative submodule URLs

On Tue, Aug 19, 2014 at 3:57 PM, Heiko Voigt hvo...@hvoigt.net wrote: I would actually error out when specified in already cloned state. Because otherwise the user might expect the remote to be updated. Since we are currently busy implementing recursive fetch and checkout I have added that to

Re: Relative submodule URLs

On Fri, Aug 22, 2014 at 11:00 AM, Marc Branchaud marcn...@xiplink.com wrote: A couple of years ago I started to work on such a thing ([1] [2] [3]), mainly because when we tried to change to relative submodules we got bitten when someone used clone's -o option so that his super-repo had no

Re: Re: Relative submodule URLs

On Sun, Aug 24, 2014 at 8:34 AM, Heiko Voigt hvo...@hvoigt.net wrote: New --with--remote parameter for 'git submodule' While having said all that about submodule settings I think a much much simpler start is to go ahead with a commandline

Re: Re: Relative submodule URLs

On Mon, Aug 25, 2014 at 9:29 AM, Robert Dailey rcdailey.li...@gmail.com wrote: On Sun, Aug 24, 2014 at 8:34 AM, Heiko Voigt hvo...@hvoigt.net wrote: New --with--remote parameter for 'git submodule' While having said all that about submodule

Re: Show containing branches in log?

On Thu, Jul 3, 2014 at 2:41 PM, Øyvind A. Holm su...@sunbase.org wrote: On 2 July 2014 16:50, Robert Dailey rcdailey.li...@gmail.com wrote: I know that with the `git branch` command I can determine which branches contain a commit. Is there a way to represent this graphically with `git log

Re: Re: Re: Relative submodule URLs

On Tue, Aug 26, 2014 at 1:28 AM, Heiko Voigt hvo...@hvoigt.net wrote: Hi Heiko, My last email response was in violation of your request to keep the two topics separate, sorry about that. I started typing it this weekend and completed the draft this morning, without having read this response

Re: Interactive staging not functioning properly?

Sorry, I just realized that when the hunks are across file boundaries, it won't go back to it. I think this is a bit misleading, it would be great to see it go back to the ACTUAL previous hunk, regardless of which file it came from. On Thu, Sep 4, 2014 at 4:54 PM, Robert Dailey rcdailey.li

How to compile Git with NDK?

I run the following on Ubuntu: fe@BLD01:~/code/git$ autoconf fe@BLD01:~/code/git$ ./configure --prefix=/home/fe/git-arm --build=x86_64-linux-gnu --host=arm-linux-androideabi configure: Setting lib to 'lib' (the default) configure: Will try -pthread then -lpthread to enable POSIX Threads.

Re: How to compile Git with NDK?

But if I type just 'make', I don't see how it will know where my ARM toolchain is. I'll read the INSTALL file in the meantime. On Mon, Sep 22, 2014 at 4:22 PM, Stefan Beller stefanbel...@gmail.com wrote: On 22.09.2014 21:04, Robert Dailey wrote: I run the following on Ubuntu: fe@BLD01:~/code

Re: How to compile Git with NDK?

On Tue, Sep 23, 2014 at 7:47 AM, Robert Dailey rcdailey.li...@gmail.com wrote: But if I type just 'make', I don't see how it will know where my ARM toolchain is. I'll read the INSTALL file in the meantime. Sorry for top post earlier, my mistake. I reviewed the INSTALL file. It doesn't mention

Specifying account profile in MSMTP

Hey guys, I'm using MSMTP to define 2 accounts: Work email and personal email. If I send patches via email through Git at work, I want to use my work SMTP server and account information. Likewise at home for personal projects, I want to use my personal SMTP account. I put my .gitconfig in

Git log with follow author not working

I have relocated a file into another directory and committed that. Using the --follow command on the NEW path of the file, I want to find all commits to that file by a specific author: $ git log --follow --author david -- new/path/to/file.cpp When I do this, I get NO results. When I use the OLD

Submodules with feature branches

I have a question regarding submodules and their applicability given our workflow at the place I work. When I work on a feature, I normally create a feature branch. If I happen to make changes to the submodule that only work with the changes introduced in my feature branch, that seems to

Proposal for pruning tags

I've never contributed to the Git project before. I'm a Windows user, so I use msysgit, but I'd be happy to install linux just so I can help implement this feature if everyone feels it would be useful. Right now AFAIK, there is no way to prune tags through Git. The way I currently do it is like

Re: Submodules with feature branches

On Thu, Jun 5, 2014 at 10:15 AM, W. Trevor King wk...@tremily.us wrote: So you have: On the trunk host: On your public host: Locally: superproject superproject superproject submodulesubmodule `-- submodule In that case, a corresponding

Re: Submodules with feature branches

On Thu, Jun 5, 2014 at 11:23 AM, W. Trevor King wk...@tremily.us wrote: 3rd party libraries sound loosely-coupled to me ;). In one of my more mature projects I did a similar thing, and just used relative URLs [1] and sibling mirrors/forks [2,3,4]. Cheers, Trevor [1]:

Re: Proposal for pruning tags

On Thu, Jun 5, 2014 at 3:50 PM, Junio C Hamano gits...@pobox.com wrote: I think you need to explain what you mean by prune a lot better than what you are doing in your message to be understood by others. After seeing the above two commands, my *guess* of what you want to do is to remove any

Annotated tags by default?

Is there a config option or some way for `git tag -a` to be the default? I could create an alias but would make more sense to have a config: git config --global tag.alwaysannotate true -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Show containing branches in log?

I know that with the `git branch` command I can determine which branches contain a commit. Is there a way to represent this graphically with `git log`? Sometimes I just have a commit, and I need to find out what branch contains that commit. The reason why `git branch --contains` doesn't solve this

Re: Show containing branches in log?

On Wed, Jul 2, 2014 at 11:34 AM, Jeff King p...@peff.net wrote: Have you tried git describe --contains --all commit? To some degree, I fear your question isn't something git can answer. If the branch containing the commit has been merged into other branches, then they all contain the commit.

Re: Show containing branches in log?

On Wed, Jul 2, 2014 at 11:52 AM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Jeff King Sent: Wednesday, July 02, 2014 12:35 On Wed, Jul 02, 2014 at 09:50:57AM -0500, Robert Dailey wrote: I know that with the `git branch` command I can determine which branches

Cross compiling git for ARM

Hello, I'm interested in cross compiling Git 2.0.3 (I have a clone from github) for ARM. Ideally I'd like to use the prebuilt gcc eabi toolchain bundled with Android NDK, since I plan to run the git executable on an ARM device running the android kernel. I've looked into the ./configure --help

Re: Show containing branches in log?

On Thu, Jul 3, 2014 at 2:41 PM, Øyvind A. Holm su...@sunbase.org wrote: I have created a script for just this functionality which I use very often, and have created a gist with the files at https://gist.github.com/sunny256/2eb583f21e0ffcfe994f, I think it should solve your problem. It contains

Subtree with submodule inside?

Is this even possible? The .gitmodule file has to be at the root of the repository, AFAIK. So if the subtree is inherently not at the root, how does it manage its own submodules? Basically I have a common library that also keeps a submodule of third party dependencies (binaries). Each super

Re: Subtree with submodule inside?

On Wed, Aug 6, 2014 at 12:51 PM, Junio C Hamano gits...@pobox.com wrote: My knee-jerk reaction would be subtree would break submodules badly, don't use it ;-). After all, I invented subtree merge as an ugly interim workaround before submodule subsystem got into a usable shape, hoping that new

Why do dates in refspecs require the reflog?

I was surprised to find today that the following didn't work as expected: $ git show master@{1 year ago}:Path/To/File.h It gave me the following warning which did not make the problem obvious at all: warning: Log for 'master' only goes back to Mon, 8 Sep 2014 12:08:44 -0500. What it is trying

Re: Why do dates in refspecs require the reflog?

On Tue, Dec 30, 2014 at 2:55 PM, Junio C Hamano gits...@pobox.com wrote: Michael Haggerty mhag...@alum.mit.edu writes: There is yet a third similar question: What is the last commit that is currently on the master branch that was *authored* at least one year ago? Please note that this

Re: xfuncname problems with C++

On Fri, Jan 2, 2015 at 10:49 AM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a function like so: void MyClass::SomeFunction(int someParameter) { // Stuff changed in here } When I do `git diff` on the file containing this function, I get a chunk showing some changed code

xfuncname problems with C++

I have a function like so: void MyClass::SomeFunction(int someParameter) { // Stuff changed in here } When I do `git diff` on the file containing this function, I get a chunk showing some changed code in this function somewhere in the middle of the body. However, the chunk header shows my

Re: xfuncname problems with C++

On Fri, Jan 2, 2015 at 2:31 PM, Johannes Sixt j...@kdbg.org wrote: Am 02.01.2015 um 18:03 schrieb Robert Dailey: On Fri, Jan 2, 2015 at 10:49 AM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a function like so: void MyClass::SomeFunction(int someParameter) { // Stuff changed

Git submodule first time update with proxy

I have a submodule using HTTP URL. I do this: $ git submodule init MySubmodule $ git submodule update MySubmodule The 2nd command fails because the HTTP URL cannot be resolved, this is because it requires a proxy. I have http.proxy setup properly in the .git/config of my parent git repository,

Re: Git submodule first time update with proxy

On Fri, Jan 23, 2015 at 4:13 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a submodule using HTTP URL. I do this: $ git submodule init MySubmodule $ git submodule update MySubmodule The 2nd

Re: Git submodule first time update with proxy

On Fri, Jan 23, 2015 at 10:23 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Fri, Jan 23, 2015 at 4:13 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a submodule using HTTP URL. I do

Re: git rerere forget isn't working?

On Mon, Jan 12, 2015 at 12:24 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: So I want a way to clear out the whole rerere cache (i.e. every remembered conflict resolution). So I try this command: $ git rerere forget . The forget subcommand

Git submodule removal and replacement results in failures

Let's say I have a submodule set to directory foo. If I remove this submodule in 1 commit (git rm -f foo) and then in a 2nd commit after that, physically commit those files, the next person that does a `git submodule update --recursive` results in failure because it says it can't overwrite files.

What is XDG_CONFIG_HOME for exactly?

My understanding is that git reads the priority of configuration as follows: 1. local_repo/.git/config 2. $HOME/.gitconfig 3. $XDG_CONFIG_HOME/git/config 4. system level git config (not sure exactly where this is; not relevant to me on Windows) I have a .gitconfig in Dropbox that I symlink to my

Re: What is XDG_CONFIG_HOME for exactly?

:50 PM, Robert Dailey rcdailey.li...@gmail.com wrote: As a follow-up, I tested the following in my .bashrc: # Utilize different GIT settings based on platform if [[ $OSTYPE == 'msys' || $OSTYPE == 'cygwin' ]]; then echo 'Using WINDOWS specific git settings' export XDG_CONFIG_HOME

Re: What is XDG_CONFIG_HOME for exactly?

settings' export XDG_CONFIG_HOME=.config-linux fi This seems to work nicely!! I share my $HOME directory (located in dropbox) across all platforms so this helps me keep a consistent environment across all my machines with zero effort. On Sun, Mar 15, 2015 at 6:37 PM, Robert Dailey rcdailey.li

Need help deciding between subtree and submodule

At my workplace, the team is using Atlassian Stash + git We have a Core library that is our common code between various projects. To avoid a single monolithic repository and to allow our apps and tools to be modularized into their own repos, I have considered moving Core to a subtree or

Re: Need help deciding between subtree and submodule

On Wed, Mar 18, 2015 at 6:04 PM, Doug Kelly dougk@gmail.com wrote: On Wed, Mar 18, 2015 at 3:20 AM, Chris Packham judge.pack...@gmail.com wrote: My $0.02 based on $dayjob (disclaimer I've never used subtree) On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey rcdailey.li...@gmail.com

Re: Rebasing with submodule change causes red herring with --continue

On Fri, Apr 10, 2015 at 11:44 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote: I have a branch that contains a commit with a single change: A submodule pointing to a new SHA1. When I rebase this branch onto the tip of its parent branch

Re: Rebasing with submodule change causes red herring with --continue

On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Fri, Apr 10, 2015 at 11:44 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote: I have a branch that contains a commit with a single change: A submodule

How are submodule conflicts resolved during rebase?

Hey guys, I'm using Git for Windows 2.3.6. There is a bit of confusion I have with regards to how submodule conflicts are resolved/handled during a rebase. Suppose I have a branch with 10 commits on it, 3 of those commits contain a change to the same (and only) submodule in the repository. When

Re: How are submodule conflicts resolved during rebase?

On Tue, Apr 28, 2015 at 9:34 AM, Robert Dailey rcdailey.li...@gmail.com wrote: Hey guys, I'm using Git for Windows 2.3.6. There is a bit of confusion I have with regards to how submodule conflicts are resolved/handled during a rebase. Suppose I have a branch with 10 commits on it, 3

Re: Rebasing with submodule change causes red herring with --continue

On Thu, Apr 23, 2015 at 5:43 PM, John Keeping j...@keeping.me.uk wrote: On Thu, Apr 23, 2015 at 09:35:38PM +0100, John Keeping wrote: On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote: Am 23.04.2015 um 21:07 schrieb Robert Dailey: On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey

Re: How are submodule conflicts resolved during rebase?

On Tue, Apr 28, 2015 at 11:49 AM, Heiko Voigt hvo...@hvoigt.net wrote: On Tue, Apr 28, 2015 at 09:34:06AM -0500, Robert Dailey wrote: Suppose I have a branch with 10 commits on it, 3 of those commits contain a change to the same (and only) submodule in the repository. When I rebase this branch

Re: Git completion not using ls-remote to auto-complete during push

On Thu, Jun 18, 2015 at 6:29 AM, SZEDER Gábor sze...@ira.uka.de wrote: Quoting Robert Dailey rcdailey.li...@gmail.com I do the following: $ git push origin :topic If I stop halfway through typing 'topic' and hit TAB, auto-completion does not work if I do not have a local branch by that name

'eol' documentation confusion

Upon inspection of the gitattributes documentation page here: https://git-scm.com/docs/gitattributes When comparing the documentation for 'text' with 'eol', I see the following missing explanations for 'eol': * eol * -eol Maybe the fact that these are missing means they are not valid to use.

Re: 'eol' documentation confusion

On Sun, Jun 21, 2015 at 9:04 AM, Robert Dailey rcdailey.li...@gmail.com wrote: Upon inspection of the gitattributes documentation page here: https://git-scm.com/docs/gitattributes When comparing the documentation for 'text' with 'eol', I see the following missing explanations for 'eol

git submodule init --recursive?

I have a few nested submodules, all use relative URLs such as: ../mysubmodule.git ../../tools/tool1.git If I change my parent repo URL, I need to recursively update all remotes in each submodule. There is no `--recursive` option for `git submodule init`. What is the recommend method for

Re: git submodule init --recursive?

On Thu, Jun 25, 2015 at 8:04 PM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a few nested submodules, all use relative URLs such as: ../mysubmodule.git ../../tools/tool1.git If I change my parent repo URL, I need to recursively update all remotes in each submodule

Re: Git completion not using ls-remote to auto-complete during push

On Thu, Jun 18, 2015 at 10:55 AM, SZEDER Gábor sze...@ira.uka.de wrote: Quoting Robert Dailey rcdailey.li...@gmail.com: On Thu, Jun 18, 2015 at 6:29 AM, SZEDER Gábor sze...@ira.uka.de wrote: Quoting Robert Dailey rcdailey.li...@gmail.com I do the following: $ git push origin :topic

Git completion not using ls-remote to auto-complete during push

I do the following: $ git push origin :topic If I stop halfway through typing 'topic' and hit TAB, auto-completion does not work if I do not have a local branch by that name (sometimes I delete my local branch first, then I push to delete it remotely). I thought that git completion code was

Re: Diffing submodule does not yield complete logs for merge commits

On Sat, May 30, 2015 at 2:19 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: In the meantime I'd like to ask, do we even need to add an option for this? What if we just

Re: Diffing submodule does not yield complete logs for merge commits

On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: In the meantime I'd like to ask, do we even need to add an option for this? What if we just make `diff.submodule log` not use --first-parent? This seems like a backward

Re: Diffing submodule does not yield complete logs for merge commits

On Sat, May 30, 2015 at 2:54 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: On Sat, May 30, 2015 at 12:04 PM, Junio C Hamano gits...@pobox.com wrote: Robert Dailey rcdailey.li...@gmail.com writes: In the meantime I'd like to ask, do we even need

Re: Diffing submodule does not yield complete logs for merge commits

On 5/21/2015 7:51 AM, Heiko Voigt wrote: On Tue, May 19, 2015 at 02:29:55PM -0500, Robert Dailey wrote: On Tue, May 19, 2015 at 5:44 AM, Heiko Voigt hvo...@hvoigt.net wrote: On Mon, May 18, 2015 at 10:06:32AM -0500, Robert Dailey wrote: Unfortunately I find it unintuitive and counter

Convenient shortcut to push delete current branch?

For convenient pushing of current branch, git supports this syntax: $ git push origin HEAD This will push your current branch up. However, is there such a shortcut for *deleting* the branch? The only goal here is to avoid having to type the branch name in the push command. Normally I rely on tab

Re: Convenient shortcut to push delete current branch?

On Thu, Oct 1, 2015 at 1:22 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Thu, Oct 1, 2015 at 9:43 AM, Robert Dailey <rcdailey.li...@gmail.com> > wrote: >> For convenient pushing of current branch, git supports this syntax: >> >> $ git push origin HE

git add without whitespace

I think it would be useful to have a '-w' option for 'git add' that completely ignores whitespace changes, the same way that 'git diff -w' does. Real life scenario: Sometimes developers will use tooling that does not properly strip trailing whitespace in source files. Next time I edit those

Re: git add without whitespace

On Mon, May 30, 2016 at 2:06 PM, Junio C Hamano wrote: > I have had this in my ~/.gitconfig for a long time. > > [alias] > wsadd = "!sh -c 'git diff -- \"$@\" | git apply --cached > --whitespace=fix;\ > git co -- ${1-.} \"$@\"' -" > > That is, "take

git clean without ignored files

I noticed that `git clean` does not handle a specific scenario. I have the following types of untracked entities in my working copy: * Untracked files in tracked directories (non-recursive; sibling files are tracked) * Untracked files in untracked directories (recursive) * Ignored files meeting

How can I get a list of checkout history?

As you know, I can checkout the Nth checked out branch via this syntax: $ git checkout @{-N} Is there a built-in mechanism to get a listing of previously checked out refs? Basically, this would be similar to 'history' command in linux where instead of actual commands, it lists like this:

How to use @{-1} with push?

I have an alias that I'm working on to do a push and delete of a topic branch: # Push HEAD, delete branch local & remote # # $1 = remote name # $2 = branch name pushdel = "!f() { : git push ; git push \"$1\" HEAD \":$2\" && git branch -d \"$2\" ; }; f" I use it after I

Re: How to use @{-1} with push?

On Fri, Mar 25, 2016 at 12:45 PM, Junio C Hamano wrote: > You can ask rev-parse to give you --symbolic-full-name, error out if > it is empty (i.e. detached HEAD), and otherwise use the result, no? > > $ git checkout next > $ git checkout master > $ git rev-parse

Re: How to use @{-1} with push?

On Fri, Mar 25, 2016 at 1:02 PM, Robert Dailey <rcdailey.li...@gmail.com> wrote: > On Fri, Mar 25, 2016 at 12:45 PM, Junio C Hamano <gits...@pobox.com> wrote: >> You can ask rev-parse to give you --symbolic-full-name, error out if >> it is empty (i.e. detached HEAD), a

Re: How to use @{-1} with push?

On Fri, Mar 25, 2016 at 1:58 PM, Junio C Hamano wrote: > I thought these are clear from their documentation. "push" works on > refnames, "branch" works on branch names. "push" takes an branch > name as a short-hand and adds refs/heads/ when it makes sense, but > because it

Best Practices with code/build fixes post-merge?

Sometimes, I merge 2 branches that have deviated quite a bit. A worst-case example would be some API change. The topic branch (long-lived) may start using the old API. However, once I merge the topic back to master, that API no longer exists. As such, every place that introduces a usage of the old

Git log three-dot notation: include merge base

If you consider a simple case where I run the following command: $ git log --oneline --graph --decorate A...B Where A and B are both branches with a single merge base and a series of commits on each branch. Very simple example with no loops or crazy ancestry. Below is an example repo I set up,

  1   2   >