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
: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
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
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.
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
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
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,
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
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
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
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
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
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
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
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
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
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
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.
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
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
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
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
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
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
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
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)
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?
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
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
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
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
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
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
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
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
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
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.
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
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
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
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
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
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
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]:
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
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
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
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
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
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
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
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
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
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
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
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
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?
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
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
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
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
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 --
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
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
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
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
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
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
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
101 - 169 of 169 matches
Mail list logo
