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
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
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
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
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 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
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
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
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/
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
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 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.
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
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
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
---
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 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
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
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
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, 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
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
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
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,
>>>>
>>>>
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
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 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
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 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 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
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
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
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
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 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
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
th '\$prefix\$sm_path'")"
> say_msg="$(eval_gettext "Submodule path
> '\$prefix\$sm_path': '\$command \$sha1'")"
> must_die_on_failure=yes
>
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
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
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
On Fri, Apr 17, 2015 at 7:59 AM, Pedro Rodrigues
wrote:
> Not completely off topic, but for consistency consider that:
> git-clone supports --recursive and --recurse-submodules, which do the
> same thing.
> git-pull and git-push only support --recurse-submodules.
It took a while to get the term
On Wed, Apr 1, 2015 at 7:20 PM, Junio C Hamano wrote:
> Chris Packham writes:
>
>> So I was just sent a patch generated with 'git format-patch' that 'git
>> am' fails to apply correctly. It applies but part of the commit
>> message is lost.
>>
&
Hi List,
So I was just sent a patch generated with 'git format-patch' that 'git
am' fails to apply correctly. It applies but part of the commit
message is lost.
The problem is that the commit message has lines like
--- Foo happened
did some things to handle Foo
--- Bar happened
Still pro
My $0.02 based on $dayjob
(disclaimer I've never used subtree)
On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey
wrote:
> 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 repositor
On Wed, Mar 18, 2015 at 8:43 PM, Chris Packham wrote:
> On Wed, Mar 18, 2015 at 10:05 AM, Junio C Hamano wrote:
>> Ryan Lortie writes:
>>
>>> On Tue, Mar 17, 2015, at 16:49, Junio C Hamano wrote:
>>>> With more recent versions of Git, namely, the versions a
On Wed, Mar 18, 2015 at 10:05 AM, Junio C Hamano wrote:
> Ryan Lortie writes:
>
>> On Tue, Mar 17, 2015, at 16:49, Junio C Hamano wrote:
>>> With more recent versions of Git, namely, the versions after
>>> 30a52c1d (Merge branch 'ms/submodule-update-config-doc' into maint,
>>> 2015-03-13), the do
A little late to this thread
On Wed, Mar 18, 2015 at 8:50 AM, Jeff King wrote:
> On Tue, Mar 17, 2015 at 03:28:57PM -0400, Ryan Lortie wrote:
>
>> The first is a question about git's basic policy with respect to things
>> like this. I hope that it's safe to assume that running 'git' commands
>>
I remember reading about an
> ssh issue with windows, but can't find it now.
>
https://github.com/msysgit/git/issues
Happy hunting :). Actually if it is a ssh problem it might be a
generic MSYS issue. So there's another bug tracker to look through
http://sourceforge.net/p/mi
Hi Erik,
On Tue, Feb 10, 2015 at 9:12 AM, wrote:
>
> I find that preview 1.8 is bluescreening on about 1 of 3 ssh pushes. 1.9
> preview 12-17-2014 doesn't even bluescreen, the windows gui locks until
> reset.
Does this mean that pushing over git:// file:// and http:// are
unaffected? Can you s
+ close $fp
>>> + if {[regexp "^gitdir: (.+)$" $line line link_target]} {
>
> 2015-02-03 3:44 UTC-05:00, Chris Packham :
>> It might be simpler to use one of the 'string' commands e.g. string
>> wordend "gitdir: " I also su
On Tue, Feb 3, 2015 at 6:24 AM, Remi Rampin wrote:
> If _is_git had to follow "gitdir: ..." files to reach the actual Git
> directory, we set _gitdir to that final path.
> ---
> lib/choose_repository.tcl | 14 ++
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/lib/
Hi Remi,
Added Pat Thoyts the git-gui maintainer.
(Disclaimer, it's been years since I did anything with Tcl).
On Tue, Feb 3, 2015 at 6:24 AM, Remi Rampin wrote:
> Function _git_dir would previously fail to accept a "gitdir: ..." file
> as a valid Git repository.
> ---
> lib/choose_repository.
On Mon, Feb 2, 2015 at 9:41 PM, Chris Packham wrote:
> Hi,
>
> On Sat, Jan 31, 2015 at 10:46 AM, Rémi Rampin wrote:
>> Hi,
>>
>> This bug report concerns git-gui. Apologies if this is not the right
>> mailing-list.
>>
>> By submodule I mean a r
i: use git rev-parse to validate paths
The current _is_git function to validate a path as a git repository does
not handle a gitfiles which have been used for submodules for some time.
Instead of using a custom function let's just ask git rev-parse.
Signed-off-by: Chris Packham
---
lib/choose_re
On Fri, Jan 30, 2015 at 6:27 AM, Chris Packham wrote:
> Hi,
>
> On Thu, Jan 29, 2015 at 8:49 AM, Dick wrote:
>> Hi all,
>>
>> I've encountered a problem with the Dictator and Lieutenants Workflow. I've
>> configured remote origin so it pulls from th
Hi,
On Thu, Jan 29, 2015 at 8:49 AM, Dick wrote:
> Hi all,
>
> I've encountered a problem with the Dictator and Lieutenants Workflow. I've
> configured remote origin so it pulls from the "blessed repository" and
> pushes to the "developer public" repository.
>
> When the "blessed repository" has
Minor typo in a comment.
On Wed, Jan 28, 2015 at 4:39 AM, Torsten Bögershausen wrote:
> The SANITY precondition was not set when running as root,
> but this is not 100% reliable for CYGWIN:
>
> A file may be allowed to be deleted when the containing
> directory does not have write permissions.
>
On Wed, Jan 28, 2015 at 6:09 AM, Chris Packham wrote:
> Hi Alexander
>
> On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov
> wrote:
>> Signed-off-by: Alexander Kuleshov
>> ---
>> INSTALL | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
Hi Alexander
On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov
wrote:
> Signed-off-by: Alexander Kuleshov
> ---
> INSTALL | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/INSTALL b/INSTALL
> index ffb071e..6f1c3d5 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -53,7 +53,7
On Sat, Jan 24, 2015 at 5:45 PM, Robert Dailey wrote:
> On Fri, Jan 23, 2015 at 10:23 PM, Robert Dailey
> wrote:
>> On Fri, Jan 23, 2015 at 4:13 PM, Chris Packham
>> wrote:
>>> Hi,
>>>
>>> On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey
>>&g
Hi,
On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey wrote:
> 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 "htt
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
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
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
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
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
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
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
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
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
(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.
>>
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
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
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
#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 +++
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.
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
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
++
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
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
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 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
On Wed, Aug 20, 2014 at 4:52 AM, Junio C Hamano wrote:
> Jeff King writes:
>
>> On Tue, Aug 19, 2014 at 04:05:21PM +1000, Babak M wrote:
>>
>>> I saw that if a hook file is present in .git/hooks and it does not
>>> have execution permissions it is silently ignored.
>>>
>>> I thought it might be w
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't tried
> to reproduce this but this is basically what I did (edited
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
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 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 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.
>
>
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
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 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
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 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 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 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
1 - 100 of 152 matches
Mail list logo
