I'm sorry if this shows up twice. I messed up the first time.
I was recently in a situation of rebasing a topic branch with many
commits by several colleagues and I thought it would be useful if I
could see the author of the commit in the commit table in the rebase
todo file. I wanted try to
Allow user to customize the format of commit table in interactive
rebase todo file. Short hashes are still required to be the second
column so these are added to the format if not already present.
Defaults to oneline as before.
Signed-off-by: William Clifford mr.william.cliff...@gmail.com
Explain sequence.format and GIT_SEQUENCE_FORMAT.
Signed-off-by: William Clifford mr.william.cliff...@gmail.com
Signed-off-by: Matthew Boeh m...@mboeh.com
---
Documentation/config.txt | 9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
Thanks Johannes and brian. Diff against v2:
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1480,13 +1480,30 @@ sub cmd_commit_diff {
sub cmd_info {
my $path_arg = defined($_[0]) ? $_[0] : '.';
my $path = $path_arg;
- if ($path =~ m!\A/!) {
+ if
If HEAD is detached, 'gitk --all' does not show it. This is inconvenient
for frontend program, and for example git log does show the detached HEAD.
gitk uses git rev-parse to find a list of branches to show.
Apparently, the command does not include detached HEAD to output if
--all argument is
Another patch to test the water before I put more effort into it.
Commit d516c2d (Teach git-diff-files the new option `--no-index` -
2007-02-22) brings the bells and whistles of git-diff to the world
outside a git repository. This patch continues that direction and adds
a new syntax
git diff
Some time ago I complained [1] about troubles using Git
on a project with high ratio of non-programmers.
Since then, a conclusion was made: Git is too complex.
While Git provides many nice advanced stuff, its simplest
workflow isn't simple enough.
So we examined other options:
* Splitting
VIEW THE ATTACHMENT
GET A QUICK LOAN - CASH DEAL LOAN.pdf
Description: Adobe PDF document
Hi Shawn and Peff,
On Wed, Sep 3, 2014 at 10:59 PM, Jeff King p...@peff.net wrote:
On Wed, Sep 03, 2014 at 10:15:15AM -0700, Shawn Pearce wrote:
I hadn't realized Git is turning 10 next year. Just been too busy
using Git to pay attention to its upcoming anniversary. Let me talk to
some folks
Marat Radchenko ma...@slonopotamus.org writes:
Some time ago I complained [1] about troubles using Git
on a project with high ratio of non-programmers.
...
Then, a lost'n'forgotten git_svn_server [4] was found.
...
Interesting.
Current limitations:
...
* You must not do 'inverted
William Clifford mr.william.cliff...@gmail.com writes:
A couple of examples:
- `git config sequence.format %(12,trunc)%ae %s`
- `git config sequence.format %s %aN %aE`
- `git config sequence.format %s%n%%n%b`
... I'm unsure what would happen if I tried to rebase with the
third style
Max Kirillov m...@max630.net writes:
If HEAD is detached, 'gitk --all' does not show it. This is inconvenient
for frontend program, and for example git log does show the detached HEAD.
git log does use the same revision machinery as rev-parse uses
internally to parse its command line
Junio C Hamano gits...@pobox.com writes:
Max Kirillov m...@max630.net writes:
If HEAD is detached, 'gitk --all' does not show it. This is inconvenient
for frontend program, and for example git log does show the detached HEAD.
git log does use the same revision machinery as rev-parse uses
Junio C Hamano gits...@pobox.com writes:
William Clifford mr.william.cliff...@gmail.com writes:
A couple of examples:
- `git config sequence.format %(12,trunc)%ae %s`
- `git config sequence.format %s %aN %aE`
- `git config sequence.format %s%n%%n%b`
... I'm unsure what would happen if I
Thomas Rast t...@thomasrast.ch writes:
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index be07705..39841a9 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -310,6 +310,26 @@ test_expect_success 'merge-recursive --index-only' '
Thomas Rast t...@thomasrast.ch writes:
The directory hash (for fast checks if the index already has a
directory) was only used in ignore_case mode and so depended on that
flag.
Make it generally available on request.
Signed-off-by: Thomas Rast t...@thomasrast.ch
---
cache.h | 2 ++
Add a new format prefix `_` that causes a line-feed to be inserted
immediately after an expansion if the expansion expands to a non-empty
string. This is useful for when you would like a line for an expansion
to be prepended, but only when the expansion expands to a non empty
string, such as
On Tue, Sep 09, 2014 at 09:49:03AM -0700, Junio C Hamano wrote:
Marat Radchenko ma...@slonopotamus.org writes:
Some time ago I complained [1] about troubles using Git
on a project with high ratio of non-programmers.
...
Then, a lost'n'forgotten git_svn_server [4] was found.
...
Thomas Rast t...@thomasrast.ch writes:
Thomas Rast t...@thomasrast.ch writes:
Git has --cc as a very fast inspection tool that shows a brief summary
of what a conflicted merge looks like, and -c/-m as give me the
full information data dumps.
But --cc actually loses information: if the merge
I see it's been accepted now. Thank you!
-Alex
--
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
Thomas Rast t...@thomasrast.ch writes:
+ assemble_conflict_entry(content,
+ branch1, branch2,
+ stage2, stage3);
+ if (write_sha1_file(content.buf, content.len,
+
Harry Jeffery ha...@exec64.co.uk writes:
Add a new format prefix `_` that causes a line-feed to be inserted
immediately after an expansion if the expansion expands to a non-empty
string. This is useful for when you would like a line for an expansion
to be prepended, but only when the
On 09/09/14 20:15, Junio C Hamano wrote:
Is this different from %n%-d?
Yes. %n%-d will place the newline before the expansion, not after.
log --decorate --pretty=format:%n%-d%h\\ %t\\ [%cn]\\ %s
---
(HEAD, upstream/master, master)85f0837 c29da1d [Junio C Hamano] Start
the post-2.1 cycle
Marat Radchenko ma...@slonopotamus.org writes:
* You must not do 'inverted merges'. Old HEAD must be reachable from
new HEAD by first-parent traversal.
I am not sure what you mean by this to properly assess how
significant this limitation is. Care to draw a simple picture?
SVN
Harry Jeffery ha...@exec64.co.uk writes:
On 09/09/14 20:15, Junio C Hamano wrote:
Is this different from %n%-d?
Yes. %n%-d will place the newline before the expansion, not after.
Maybe %[-+ ] needs to be rethought, instead of making things worse
by turning it into %[-_+ ], as the next
Am 08.09.2014 um 19:50 schrieb Junio C Hamano:
René Scharfe l@web.de writes:
Am 06.09.2014 um 21:20 schrieb David Aguilar:
Add dependent headers so that including a header does not
require including additional headers.
This makes it so that gcc -c $header succeeds for each header.
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The second batch of topics have graduated to 'master'. There are
too many topics waiting to be in 'next' but without comments and
reviews on
Downloaded the git-2.1.0.tar.gz tarball.
Cannot build git 2.1.0:
$ V=1 make prefix=/usr/local all
...
cc -o xdiff/xpatience.o -c -MF xdiff/.depend/xpatience.o.d -MQ
xdiff/xpatience.o -MMD -MP -g -O2 -Wall -I.
-DHAVE_ALLOCA_H -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME
On Tue, Sep 09, 2014 at 12:37:48PM -0700, Junio C Hamano wrote:
Harry Jeffery ha...@exec64.co.uk writes:
On 09/09/14 20:15, Junio C Hamano wrote:
Is this different from %n%-d?
Yes. %n%-d will place the newline before the expansion, not after.
Maybe %[-+ ] needs to be rethought,
From: Jeff King p...@peff.net
Date: Fri, 29 Aug 2014 16:31:46 -0400
Upon finding a corrupt loose object, we forgot to note the error to
signal it with the exit status of the entire process.
[jc: adjusted t1450 and added another test]
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* I
On Tue, Sep 09, 2014 at 03:03:33PM -0700, Junio C Hamano wrote:
From: Jeff King p...@peff.net
Date: Fri, 29 Aug 2014 16:31:46 -0400
Upon finding a corrupt loose object, we forgot to note the error to
signal it with the exit status of the entire process.
[jc: adjusted t1450 and added
On Mon, Sep 01, 2014 at 02:17:43PM -0400, David Turner wrote:
I don't think git fsck should return !0 in this case. Yes, it's an
inconsistency in the repo, but it's sometimes due to erroneous
conversions from another SCM or some other (non-standard) implementation
of the git client. I've
On 09/09/14 22:45, Jeff King wrote:
Yeah, that was my thought on reading the initial patch, too. Why limit
ourselves to newlines and spaces. I'd much rather have full conditional
expansion, like ${foo:+prefix $foo suffix} in the shell.
Something like the patch below might work, but I didn't
On Tue, Sep 09, 2014 at 02:26:22PM -0700, Junio C Hamano wrote:
* jk/command-line-config-empty-string (2014-08-05) 1 commit
(merged to 'next' on 2014-08-29 at 74f04af)
+ config: teach git -c to recognize an empty string
git -c section.var command and git -c section.var= command
should
Junio C Hamano gits...@pobox.com writes:
From: Jeff King p...@peff.net
Date: Fri, 29 Aug 2014 16:31:46 -0400
Upon finding a corrupt loose object, we forgot to note the error to
signal it with the exit status of the entire process.
[jc: adjusted t1450 and added another test]
Spoke too
Junio C Hamano wrote:
By the way, Jonathan, with dbedf8bf (t1450 (fsck): remove dangling
objects, 2010-09-06) you added a 'test_might_fail git fsck' to the
1450 test that catches an object corruption. Do you remember if
there was some flakiness in this test that necessitated it, or is it
On Tue, Sep 09, 2014 at 11:17:20PM +0100, Harry Jeffery wrote:
I definitely prefer your more general solution to my
bare-minimum-to-scratch-itch patch. I'd certainly be willing to take your
patch and expand upon it (pun unintended) once Junio has weighed in on your
suggestions.
Thanks. I am
Michael Haggerty mhag...@alum.mit.edu writes:
If the call to adjust_shared_perm() fails, lock_file returns -1, which
to the caller looks like any other failure to lock the file. So in
this case, roll back the lockfile before returning so that the lock
file is deleted immediately and the
Michael Haggerty mhag...@alum.mit.edu writes:
If there is an error copying the old contents to the lockfile, roll
back the lockfile before exiting so that the lockfile is not held
until process cleanup.
Same comment as 06/32 applies here.
--
To unsubscribe from this list: send the line
Michael Haggerty mhag...@alum.mit.edu writes:
+LOCK_NODEREF::
I think I've seen this mentioned already but LOCK_NO_DEREF to avoid
lock the node ref? misreading?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
On Tue, Sep 09, 2014 at 04:34:02PM -0400, Gerry Reno wrote:
Downloaded the git-2.1.0.tar.gz tarball.
Cannot build git 2.1.0:
Weird. It works fine for me on Debian unstable. What platform are you on?
cc -g -O2 -Wall -I. -DHAVE_ALLOCA_H -DHAVE_PATHS_H -DHAVE_DEV_TTY
On Mon, Sep 08, 2014 at 04:36:49PM +0200, R. Klomp wrote:
Ok great! That indeed fixed the issue.
Although I still don't understand why it didn't work without -solo..
since it didn't work when no instance of Beyond Compare was running as
well.
There must be something not quite right in
On Mon, Sep 08, 2014 at 12:57:46PM -0700, Junio C Hamano wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com writes:
+IFS='
+'
+git ls-files *.h ewah/*.h vcs-svn/*.h xdiff/*.h |
Hmm. This is only for
Hi Duy, Michael, Junio C Hamano:
Thanks for working on lock file issue.
Thank you! Thank you~
^_^
Yue Lin Ho
--
View this message in context:
http://git.661346.n2.nabble.com/What-s-cooking-in-git-git-Aug-2014-02-Fri-8-tp7616651p7618314.html
Sent from the git mailing list archive at
44 matches
Mail list logo
