On Tue, Jul 28, 2015 at 7:10 PM, Filippo Gatti
wrote:
> Hi,
>
> I'm currently running git on a cygwin platform.
> I would like to know how i can set up a sort of configuration file to launch
> automatically the ssh-agent and get connected to github (for istance)
> directly.
I'm not a regular cygw
Hi All,
A developer at $dayjob called me over to have a look at a git error he
was getting (names changed to protect the innocent).
$ git --version
git version 2.5.0
$ git clone ssh://example.com/repo.git
Cloning into 'repo'...
fatal: I don't handle protocol '/home/user/src/ssh'
After
Bike shedding a little (I've never used the signed push functionality)
On Fri, Aug 14, 2015 at 7:00 AM, Dave Borowitz wrote:
> The "if-possible" name and weird tri-state boolean is basically a straw man,
> and I am happy to change if someone has a clearer suggestion.
what about git push --signed
th '\$prefix\$sm_path'")"
> say_msg="$(eval_gettext "Submodule path
> '\$prefix\$sm_path': '\$command \$sha1'")"
> must_die_on_failure=yes
>
On Wed, Sep 2, 2015 at 7:45 PM, Jesper Jørgensen
wrote:
> Hi,
>
> I am learning how git works, and is using the excellent book on the official
> site.
> I believe I have located a mistake in one of the images.
> It is about Figure 3.17 on this page :
> http://git-scm.com/book/en/v2/Git-Branchin
On Fri, Sep 11, 2015 at 4:28 AM, Jacob Keller wrote:
> Hey,
>
> does anyone know of any tricks for storing a cover letter for a patch
> series inside of git somehow? I'd guess the only obvious way currently
> is to store it at the top of the series as an empty commit.. but this
> doesn't get email
Hi,
I have a applypatch-msg hook that implements some policy for
acceptable commit messages and reject non-conformant patches. It also
is able to prompt me to override it's rejection. The prompting only
happens when stdin is a tty (as determined by pythons
sys.stdin.isatty())
For example this wou
On Sat, Oct 3, 2015 at 6:43 AM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Chris Packham writes:
>>
>>> As of git 2.6 this has stopped working and stdin always fails the tty
>>> check.
>>
>> We now run that hook thru run_hook_ve(), which
Signed-off-by: Chris Packham
---
Hi,
I noticed --recurse-submodules was missing from the bash completion. This adds
it. I went for '--recurse-submodules' instead of '--recursive' as I seem to
recall the former being agreed upon as the better (or least ambiguous) of the
This is similar to the existing "reword" command in that it can be used
to update the commit message the difference is that the editor presented
to the user for the commit. It provides a useful shorthand for "exec git
commit --amend --no-edit -s"
Signed-off-by: Chris Packham
On Thu, Aug 4, 2016 at 2:31 AM, Johannes Schindelin
wrote:
> Hi Chris,
>
> On Wed, 3 Aug 2016, Chris Packham wrote:
>
>> This is similar to the existing "reword" command in that it can be used
>> to update the commit message the difference is that the edito
On Thu, Aug 4, 2016 at 6:08 AM, Jeff King wrote:
> On Wed, Aug 03, 2016 at 09:08:48AM -0700, Junio C Hamano wrote:
>
>> > However, I could imagine that we actually want this to be more extensible.
>> > After all, all you are doing is to introduce a new rebase -i command that
>> > does nothing else
On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano wrote:
> The last one 3/3 is a nice touch that makes sure that we do not
> forget what we discovered during the discussion. Very much
> appreciated.
>
> Will queue. Thanks.
Did you want me to send a v4 to mark the strings for translation or
will y
Pass a list of suppressions to cppcheck so that legitimate errors are
more obvious.
Signed-off-by: Chris Packham
---
On Thu, Dec 15, 2016 at 12:24 AM, Jeff King wrote:
> The patch itself is OK to me, I guess. The interesting part will be
> whether people start actually _using_ cppche
On Fri, Dec 16, 2016 at 9:28 PM, Lars Schneider
wrote:
>
> On 14 Dec 2016, at 12:24, Jeff King wrote:
>
> On Wed, Dec 14, 2016 at 10:27:31PM +1300, Chris Packham wrote:
>
> Changes in v2:
>
> - only run over actual git source files.
>
> - omit any files in
On Mon, Dec 19, 2016 at 1:18 AM, Kaartic Sivaraam
wrote:
> Hello all,
>
> I have found the "Did you mean this?" feature of git as a very good
> feature. I thought it would be even better if it took a step toward by
> asking for a prompt when there was only one alternative to the command
> that was
I hit this at $dayjob recently.
A developer had got themselves into a confused state when needing to
resolve a merge conflict.
They knew about git rebase --continue (and git am and git cherry-pick)
but they were unsure how to "continue" a merge (it didn't help that
the advice saying to use 'git c
On Sat, Dec 10, 2016 at 8:16 AM, Junio C Hamano wrote:
> Jeff King writes:
>
>>> They knew about git rebase --continue (and git am and git cherry-pick)
>>> but they were unsure how to "continue" a merge (it didn't help that
>>> the advice saying to use 'git commit' was scrolling off the top of th
ing a '--continue' option adding such
an option to 'git merge' presents a consistent UI.
Signed-off-by: Chris Packham
---
So here is a quick patch that adds the --continue option. I need to add
some tests (suggestions for where to start are welcome).
Documentat
On Mon, Dec 12, 2016 at 10:02 PM, Markus Hitter wrote:
> Am 12.12.2016 um 09:34 schrieb Chris Packham:
>> Teach 'git merge' the --continue option which allows 'continuing' a
>> merge by completing it. The traditional way of completing a merge after
>>
ing a '--continue' option adding such
an option to 'git merge' presents a consistent UI.
Signed-off-by: Chris Packham
---
Notes:
Changes in v2:
- add --continue to builtin_merge_usage
- verify that no other arguments are present when --continue is used.
- ad
Add 'git merge --continue' option when completing.
Signed-off-by: Chris Packham
---
Notes:
Changes in v2:
- new.
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/comp
Add cppcheck target to Makefile. Cppcheck is a static
analysis tool for C/C++ code. Cppcheck primarily detects
the types of bugs that the compilers normally do not detect.
It is an useful target for doing QA analysis.
Based-on-patch-by: Elia Pinto
Signed-off-by: Chris Packham
---
I had been
On Tue, Dec 13, 2016 at 10:22 PM, Chris Packham wrote:
> Add cppcheck target to Makefile. Cppcheck is a static
> analysis tool for C/C++ code. Cppcheck primarily detects
> the types of bugs that the compilers normally do not detect.
> It is an useful target for doing QA analysis.
On Wed, Dec 14, 2016 at 1:28 AM, Jeff King wrote:
> On Tue, Dec 13, 2016 at 07:15:10AM -0500, Jeff King wrote:
>
>> I think these last two are a good sign that we need to be feeding the
>> list of source files to cppcheck. I tried your patch and it also started
>> looking in t/perf/build, which ar
On Wed, Dec 14, 2016 at 1:15 AM, Jeff King wrote:
> On Tue, Dec 13, 2016 at 10:22:25PM +1300, Chris Packham wrote:
>
>> $ make cppcheck
>> cppcheck --force --quiet --inline-suppr .
>> [compat/nedmalloc/malloc.c.h:4093]: (error) Possible null pointer
>> derefe
Add 'git merge --continue' option when completing.
Signed-off-by: Chris Packham
---
Changes in v2:
- new
Changes in v3:
- none
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/
Like '--continue', the '--abort' option doesn't make any sense with
other options or arguments to 'git merge' so ensure that none are
present.
Signed-off-by: Chris Packham
---
Changes in v3:
- new
builtin/merge.c | 4
t/t7600-merge.sh | 2 ++
2 files c
ing a '--continue' option adding such
an option to 'git merge' presents a consistent UI.
Signed-off-by: Chris Packham
---
Changes in v2:
- add --continue to builtin_merge_usage
- verify that no other arguments are present when --continue is used.
- add basic test
Changes in v3
be enabled by specifying CPPCHECK_ADD. This is a
comma separated list which is passed to cppcheck's --enable option. To
enable style and warning checks run
make cppcheck CPPCHECK_ADD=style,warning
Based-on-patch-by: Elia Pinto
Signed-off-by: Chris Packham
---
Changes in v2:
- only run
Hi All,
I have the git-sh-prompt configured in my .bashrc today I visited an
old worktree that I haven't really touched in a few years (sorry can't
remember the git version I was using back then). I received the
following output when changing to the directory
git: pathspec.c:317: prefix_pathspec:
On Thu, Jun 16, 2016 at 4:59 PM, Chris Packham wrote:
> Hi All,
>
> I have the git-sh-prompt configured in my .bashrc today I visited an
> old worktree that I haven't really touched in a few years (sorry can't
> remember the git version I was using back then). I receiv
On Fri, Jun 17, 2016 at 7:48 AM, Stefan Beller wrote:
> On Thu, Jun 16, 2016 at 10:59 AM, Junio C Hamano wrote:
>> Chris Packham writes:
>>
>>> On Thu, Jun 16, 2016 at 4:59 PM, Chris Packham
>>> wrote:
>>>> Hi All,
>>>>
>>>>
Allow completion of refs with a ^ prefix. This allows completion of
commands like 'git log HEAD ^origin/master'.
Signed-off-by: Chris Packham
---
I often find myself using variations of 'git log HEAD ^origin/master' to
see commits that I have locally that have not been pushe
Hi Florian
On Tue, Mar 29, 2016 at 7:01 PM, Florian Manschwetus
wrote:
> Hi,
> I put together a first patch for the issue.
>
> Mit freundlichen Grüßen / With kind regards
> Florian Manschwetus
>
> E-Mail: manschwe...@cs-software-gmbh.de
> Tel.: +49-(0)611-8908534
>
> CS Software Concepts and Solu
On Tue, Mar 29, 2016 at 3:07 AM, ratheesh kannoth
wrote:
> 'git diff 'is opening in meld. I could not create a patch using - git
> diff > ./patch-01
> i did not make any change to pick meld, by default it is picking meld.
>
>
> Which "git difftool" will help to create patch ? i do want to use
>
Hi,
We ran into something at $dayjob the other day. The actual problem was
a developer ended up amending a commit that had already been pushed.
It happens occasionally and is usually recoverable with a simple
rebase and is generally a learning experience. In this particular case
however things wer
On Wed, Apr 6, 2016 at 10:24 AM, Junio C Hamano wrote:
> Chris Packham writes:
>
>> We ran into something at $dayjob the other day. The actual problem was
>> a developer ended up amending a commit that had already been pushed.
>> It happens occasionally and is usually r
On Mon, Oct 26, 2015 at 12:10 PM, John Smith wrote:
> I found that I use submodules much, much more often in my git projects than I
> used externals
> in Subversion and the reason is that git encourages/forces to organize large
> projects into
> smaller repositories, one reason for this being th
Hi,
At $dayjob we've been using a pre-applypatch hook to keep an eye on
some software metrics as sub-area maintainers receive changes from
developers. When a particular metric goes up we inform the maintainer
that they should reject the patch and stop 'git am' from continuing.
When the metric goes
Hi Erik,
On Fri, Apr 28, 2017 at 11:25 AM, Erik Haller wrote:
> Getting the following error for a submodule when using git/ssh:
>
> $ git clone --recursive ssh://incense:/home/erik/git/nacl.git
> Cloning into 'nacl'...
> remote: Counting objects: 32, done.
> remote: Compressing objects: 100% (25/
Hi,
On Wed, Mar 15, 2017 at 5:51 PM, Dũng Đặng Minh wrote:
> Hi Git team,
>
> Thank you all for create a great tool.
> Last week, I updated the last version of git (2.12.0 x64-Windows) and
> all Unicode characters are display un-correctly. You can see:
> http://imgur.com/a/eriKQ
>
Looks like the
Apologies in advance for the vagueness of this bug report.
I was juggling a few patches around in a git repo (happens to be linux
but that's probably not particularly relevant).
I'd been reverting, rebasing and cherry-picking on the CLI. Then I
found I needed one more commit which I located with
On 13/02/14 10:55, Robert Dailey wrote:
> I have the following alias defined:
> sync = "!f() { cbr=$(git rev-parse --abbrev-ref HEAD); git co $1 &&
> git pull && git co $cbr && git rebase $1; }; f"
>
> The goal is to basically update a local branch which tracks a branch
> on a remote, and then reb
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 the additional typing
> obviously. Does anyone know how I can get the pager to wo
On 24/02/14 09:33, Robert Dailey wrote:
> On Sat, Feb 22, 2014 at 1:39 AM, Chris Packham
> 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 msysgi
On 27/02/14 04:54, Robert Dailey wrote:
> On Wed, Feb 26, 2014 at 3:26 AM, Jeff King 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.
Hi,
I don't know if this really counts as a bug but it is a little
annoying from a user experience point of view.
We're using an applypatch-msg hook to check that certain things
(reviewer, bug entry etc) are recorded correctly in commit messages.
My expectation is that if our applypatch-msg hook
Hi,
On 05/03/14 15:49, Phillip Susi wrote:
> I applied a patch with git am that adds a new source file to a new
> directory, and later noticed that file was missing from the commit.
> It seems that git am fails to add the new file/directory to the index.
>
Could you provide a few more details su
On 05/03/14 16:22, Phillip Susi wrote:
> On 03/04/2014 10:08 PM, Chris Packham wrote:
>> Could you provide a few more details such as your git version (git
>> --version) and an example of the failure. I've tried to reproduce
>> the problem based on the description pro
The --patch-format option has been supported for a while but it is not
mentioned in the man page and the short help cannot tell the user what
the supported formats are. Add the option to the man page along with the
supported options.
Signed-off-by: Chris Packham
---
I've not bothered to act
On 11/03/14 16:51, Chris Packham wrote:
> The --patch-format option has been supported for a while but it is not
> mentioned in the man page and the short help cannot tell the user what
> the supported formats are. Add the option to the man page along with the
> supported options.
>
On 17/03/14 19:39, Junio C Hamano wrote:
> Chris Packham writes:
>
>> Ping?
>
> Hasn't it been already cooking in 'next' for a few days?
>
Indeed I think I missed a "What's cooking". Do you want me to submit a
fixup for the spelling mista
---
On 17/03/14 20:35, Chris Packham wrote:> On 17/03/14 19:39, Junio C Hamano
wrote:
>> Chris Packham writes:
>>
>>> Ping?
>>
>> Hasn't it been already cooking in 'next' for a few days?
>>
>
> Indeed I think I missed a "
On Tue, Aug 19, 2014 at 4:35 PM, Chris Packham wrote:
> On Tue, Aug 19, 2014 at 4:33 PM, Chris Packham
> wrote:
>> Hi,
>>
>> I was just setting up a new project using submodules and have run into
>> what appears to be a hang when git status is invoked. I haven&#x
Hi Paul,
Just noticed something in the version of gitk included in git 2.0.3.
When I right click on a commit and select "write commit to file" the
resulting file has the diff from the selected commit but the commit
message from the previous commit.
Attached is an example from running gitk on git
On Wed, Sep 3, 2014 at 5:22 PM, Chris Packham wrote:
> Hi Paul,
>
> Just noticed something in the version of gitk included in git 2.0.3.
>
> When I right click on a commit and select "write commit to file" the
> resulting file has the diff from the selected commit b
++
2 files changed, 37 insertions(+), 1 deletion(-)
Chris Packham (1):
am: add gitk patch format
--
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
leading whitespace.
Signed-off-by: Chris Packham
---
Documentation/git-am.txt |3 ++-
git-am.sh| 35 +++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 9adce37..b59
Reviewing my own code.
On Wed, Sep 3, 2014 at 9:35 PM, Chris Packham wrote:
> Patches created using gitk's "write commit to file" functionality (which
> uses 'git diff-tree -p --pretty' under the hood) need some massaging in
> order to apply cleanly. This cons
On Wed, Sep 3, 2014 at 9:35 PM, Chris Packham wrote:
> Hi List,
>
> When I first tried to apply a patch someone gave me I got the following
> errors.
>
> $ git am patch.patch
> tr: write error: Broken pipe
> tr: write error
> Patch format detection failed.
#x27;ve also updated 'am: avoid re-directing stdin twice' to add some tests
and only strip the description part of the patch.
Chris Packham (2):
am: add gitk patch format
am: avoid re-directing stdin twice
Documentation/git-am.txt | 3 ++-
git-am.sh| 38 +++
roken pipe
tr: write error
Patch format detection failed.
Cc: Stephen Boyd
Signed-off-by: Chris Packham
---
git-am.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-am.sh b/git-am.sh
index f979925..5d69c89 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -253,7 +
leading whitespace.
Signed-off-by: Chris Packham
---
Documentation/git-am.txt | 3 ++-
git-am.sh| 36
t/t4150-am.sh| 13 +
3 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-am.txt b/Doc
On Thu, Sep 4, 2014 at 11:19 AM, Junio C Hamano wrote:
> Chris Packham writes:
>
>> Patches created using gitk's "write commit to file" functionality (which
>> uses 'git diff-tree -p --pretty' under the hood) need some massaging in
>> order to ap
Hi Junio,
On Fri, Sep 5, 2014 at 5:21 AM, Junio C Hamano wrote:
> Chris Packham writes:
>
>> Another thing that I've since realised is that this 'gitk' format is
>> also what you've get from git show or git log -p. So this is actually
>> allowing
(added back git ml because I accidentally dropped the Cc when replying
to Junio).
On Fri, Sep 5, 2014 at 10:57 AM, Junio C Hamano wrote:
>>> I doubt that a patchset that does
>>> not update mailinfo and mailsplit to extract information and to undo
>>> the indentation could be a right solution.
>>
e external filter programs.
Chris Packham (4):
am: avoid re-directing stdin twice
t/am: add test for stgit patch format
t/am: add tests for hg patch format
am: add gitk patch format
Documentation/git-am.txt | 3 +-
git-am.sh| 38 +++-
t/t4150-am.sh
roken pipe
tr: write error
Patch format detection failed.
Cc: Stephen Boyd
Signed-off-by: Chris Packham
---
Nothing new since http://article.gmane.org/gmane.comp.version-control.git/256425
git-am.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-am.sh b/git-am.sh
leading whitespace.
Signed-off-by: Chris Packham
---
This hasn't materially changed from the version Junio expressed
reservations about[1]. It solves my immediate problem but perhaps this
(as well as stgit and hg) belong as external filters in a pipeline
before git am. Or maybe mailsp
This adds a tests which exercise the detection of the stgit format.
There is a current know breakage in that the code that deals with stgit
in split_patches can't handle reading from stdin.
Signed-off-by: Chris Packham
---
t/t4150-am.sh | 27 +++
1 file change
This adds a tests which exercise the detection of the hg format. As
with stgit there is a current know breakage in where split_patches can't
handle reading from stdin with these patch formats.
Cc: Giuseppe Bilotta
Signed-off-by: Chris Packham
---
Note. I don't have access to a
On Sat, Sep 6, 2014 at 8:26 AM, Johannes Sixt wrote:
> Am 05.09.2014 12:06, schrieb Chris Packham:
>> In check_patch_format we feed $1 to a block that attempts to determine
>> the patch format. Since we've already redirected $1 to stdin there is no
>> need to redirect
On Sat, Sep 6, 2014 at 6:29 AM, Junio C Hamano wrote:
> Chris Packham writes:
>
>> So teaching git mailinfo to do s/^// (either when asked to or
>> using some heuristic) would be a better approach? I also think we
>> should accept "Author:" as an acc
Hi,
On Fri, Oct 3, 2014 at 5:42 PM, Nazri Ramliy wrote:
> Hi,
>
> When working on a "new feature branch" that touches a lot of files I
> tend to make commits that affect only single files, and for very small
> changes. Since at this stage I'm experimentating a lot - trying out
> ideas, etc. - the
This makes the "Write commit to file" context menu option generate a file that
is consumable by 'git am'.
Signed-off-by: Chris Packham
---
Hi Paul,
This is the other side of a git patch I was looking at a while ago[1]. The basic
problem was people were using gitk
On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches wrote:
> I have a patch file created by git format-patch.
>
> Applying it via git am changes the subject prefix.
> Anyone know why?
>
> $ git --version
> git version 2.1.2
>
> $ git am -i 0002-staging-ft1000-Logging-message-neatening.patch
> Commit Body
Hi Pat,
I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet)
which includes gitgui-0.19.0 and I'm getting a new error when I run
'git gui' in a repository with a .git file (created by git submodule).
I can send you a screencap of the error message off list if you want
but the tex
On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham wrote:
> Hi Pat,
>
> I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet)
> which includes gitgui-0.19.0 and I'm getting a new error when I run
> 'git gui' in a repository with a .git file (c
ubmodule's $GIT_DIR. Unfortunately vsatisfies doesn't handle versions
like v2.0.0.rc0 so the fall-back logic is triggered.
Given the fact that git 1.7.0 was released over 4 years ago rather than
fixing the fall-back logic it seems reasonable to drop the version
check.
Signed-off-by: Chris Pac
Hi,
I know there are a few people on this list that do git training in
various forms. At $dayjob I've been asked to run a few training
sessions in house. The initial audience is SW developers so they are
fairly clued up on VCS concepts and most have some experience
(although some not positive) wit
On 07/05/14 00:10, Pat Thoyts wrote:
> Chris Packham writes:
>
>> On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham
>> wrote:
>>> Hi Pat,
>>>
>>> I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet)
>>> which includ
On 07/05/14 19:28, Chris Packham wrote:
> On 07/05/14 00:10, Pat Thoyts wrote:
>> Chris Packham writes:
>>
>>> On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham
>>> wrote:
>>>> Hi Pat,
>>>>
>>>> I'm running git 2.0.0-rc0 (ha
Hi,
On 06/05/14 11:50, Junio C Hamano wrote:
> John Keeping writes:
>
>> On Tue, Apr 29, 2014 at 03:38:07PM -0700, Junio C Hamano wrote:
>>> * fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
>>> ...
>>> Move remote-hg and remote-bzr out of contrib/. There were some
>>> suggestion
On 08/05/14 18:54, Jianyu Zhan wrote:
> Usually, a trivial change(like coding style fix) may bury a
> original change of the code, and thus git blame is of less
> help. And to address this situation, I have to do like this:
>
>git blame -s REF^ > temp
>
> to dig into the history recursively
Hi,
On 13/05/14 11:45, Yann Dirson wrote:
> In 2.0rc2, git-gui is unable to work inside submodules, where 1.9.2
> did not show such a problem:
>
>
> yann@home:~$ cd /tmp/
> yann@home:tmp$ mkdir foo
> yann@home:tmp$ cd foo/
> yann@home:foo$ git init
> Initialized empty Git repository in /tmp/foo/
ne for both the place
> that caused the reported bug and another spot where the git version is
> tested for another feature.
>
> Reported-by: Chris Packham
> Reported-by: Yann Dirson
> Signed-off-by: Jens Lehmann
> ---
Looks good to me (refer to previous comment about being ru
gt; the new major version is larger. This is done for both the place that
> caused the reported bug and another spot where the git version is tested
> for another feature.
>
> Reported-by: Chris Packham
> Reported-by: Yann Dirson
> Helped-by: Pat Thoyts
> Signed-off-by: Je
On 25/05/14 15:50, Jeremiah Mahler wrote:
> Some minor wording fixes in the user manual and glossary.
>
> Signed-off-by: Jeremiah Mahler
> ---
> Documentation/glossary-content.txt | 2 +-
> Documentation/user-manual.txt | 8
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> d
On 25/05/14 20:37, Jeremiah Mahler wrote:
> On Sun, May 25, 2014 at 07:56:41PM +1200, Chris Packham wrote:
>> On 25/05/14 15:50, Jeremiah Mahler wrote:
>>> Some minor wording fixes in the user manual and glossary.
> ...
>>>
>>> -Eventually the developer clo
On 28/05/14 18:14, Jeremiah Mahler wrote:
> From signal(2)
>
> The behavior of signal() varies across UNIX versions, and has also var‐
> ied historically across different versions of Linux. Avoid its use:
> use sigaction(2) instead. See Portability below.
Minor nit. The last sentence a
On 28/05/14 19:40, Johannes Sixt wrote:
> Am 5/28/2014 8:14, schrieb Jeremiah Mahler:
>> From signal(2)
>>
>> The behavior of signal() varies across UNIX versions, and has also var‐
>> ied historically across different versions of Linux. Avoid its use:
>> use sigaction(2) instead. See Po
On Fri, May 30, 2014 at 11:12 AM, Jonathan Leonard wrote:
>> But you do not give much information about your special use
>> case. I assume you have submodule repositories for which some
>> developers have a valid ssh key and others don't (maybe
>> because they should only have read access via http
On 31/05/14 08:58, Jeremiah Mahler wrote:
> From signal(2) man page:
>
> The behavior of signal() varies across UNIX versions, and has also var‐
> ied historically across different versions of Linux. Avoid its use:
> use sigaction(2) instead.
>
> Replaced signal() with sigaction() in co
Add a config option that will cause clone to recurse into submodules as
if the --recurse-submodules option had been specified on the command
line. This can be overridden with the --no-recurse-submodules option.
Signed-off-by: Chris Packham
---
On 04/06/14 09:05, Junio C Hamano wrote:
>> Ma
On 05/06/14 07:42, Heiko Voigt wrote:
> On Wed, Jun 04, 2014 at 10:24:06AM -0700, Junio C Hamano wrote:
>> Chris Packham writes:
>>
>>> On 04/06/14 09:05, Junio C Hamano wrote:
>>>>> Also, going --recursive when the user did not want is a lot more
>&g
On 23/07/14 14:49, Ross Boylan wrote:
> My local master branch is the result of a merge of upstream master and
> some local changes. I want to merge in more recent upstream work.
> git pull doesn't seem to have updated origin/master, and git checkout
> origin/master also doesn't seem to work.
>
>
Hi List,
At $dayjob we maintain internal forks of the a number of upstream repositories.
Unsurprisingly updating these forks can be extremely problematic,
especially when it's only one person doing the merge. Fortunately most
of us are in the same physical location so it is possible to drag in
so
On Tue, Aug 12, 2014 at 6:44 AM, Junio C Hamano wrote:
> Chris Packham writes:
>
>> Is there any way where we could share the conflict resolution around
>> but still end up with a single merge commit.
>
> One idea that immediately comes to me is to use something
Hi,
I was just setting up a new project using submodules and have run into
what appears to be a hang when git status is invoked. I haven't tried
to reproduce this but this is basically what I did (edited highlights
from my bash_history).
$ git --version
git version 2.0.3
$ mkdir proj
$ cd pro
1 - 100 of 152 matches
Mail list logo
