* [PATCH] git-merge-ff: fast-forward only merge @ 2007-06-26 4:01 Sam Vilain 2007-06-28 11:33 ` Matthias Lederhofer 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-26 4:01 UTC (permalink / raw) To: git; +Cc: Sam Vilain This is primarily so that there is an easy switch to 'git-pull' to be sure to fast forward only. --- Documentation/merge-strategies.txt | 5 +++++ Makefile | 2 +- git-merge-ff.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletions(-) create mode 100644 git-merge-ff.sh diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 7df0266..00739bc 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -33,3 +33,8 @@ ours:: merge is always the current branch head. It is meant to be used to supersede old development history of side branches. + +ff:: + This is a degenerate merge strategy that always fails, which + means that the only time the target branch will change is if + there was no merge ("fast-forward" merge only). diff --git a/Makefile b/Makefile index 29243c6..6311eb5 100644 --- a/Makefile +++ b/Makefile @@ -208,7 +208,7 @@ SCRIPT_SH = \ git-tag.sh git-verify-tag.sh \ git-applymbox.sh git-applypatch.sh git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ - git-merge-resolve.sh git-merge-ours.sh \ + git-merge-resolve.sh git-merge-ours.sh git-merge-ff.sh \ git-lost-found.sh git-quiltimport.sh SCRIPT_PERL = \ diff --git a/git-merge-ff.sh b/git-merge-ff.sh new file mode 100644 index 0000000..b0e0f85 --- /dev/null +++ b/git-merge-ff.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +# Copyright (c) 2007 Sam Vilain +# +# A degenerate merge strategy that only allows fast-forwarding. +# + +exit 1; -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-merge-ff: fast-forward only merge 2007-06-26 4:01 [PATCH] git-merge-ff: fast-forward only merge Sam Vilain @ 2007-06-28 11:33 ` Matthias Lederhofer 2007-06-28 13:01 ` Johannes Schindelin 0 siblings, 1 reply; 6+ messages in thread From: Matthias Lederhofer @ 2007-06-28 11:33 UTC (permalink / raw) To: Sam Vilain; +Cc: git Sam Vilain <sam.vilain@catalyst.net.nz> wrote: > This is primarily so that there is an easy switch to 'git-pull' to > be sure to fast forward only. > --- > Documentation/merge-strategies.txt | 5 +++++ > Makefile | 2 +- > git-merge-ff.sh | 8 ++++++++ > 3 files changed, 14 insertions(+), 1 deletions(-) > create mode 100644 git-merge-ff.sh git-merge-ff.sh should be executable, added to .gitignore and the strategy should be added to the available strategies. And somehow it did not work for me at all: % git merge -s ff origin/master git-merge.sh: needs update Trying really trivial in-index merge... Wonderful. In-index merge [..] % git show HEAD|grep Merge Merge: 117a93c... f578825... Merge commit 'origin/master' ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-merge-ff: fast-forward only merge 2007-06-28 11:33 ` Matthias Lederhofer @ 2007-06-28 13:01 ` Johannes Schindelin 0 siblings, 0 replies; 6+ messages in thread From: Johannes Schindelin @ 2007-06-28 13:01 UTC (permalink / raw) To: Matthias Lederhofer; +Cc: Sam Vilain, git Hi, On Thu, 28 Jun 2007, Matthias Lederhofer wrote: > Sam Vilain <sam.vilain@catalyst.net.nz> wrote: > > This is primarily so that there is an easy switch to 'git-pull' to > > be sure to fast forward only. > > --- > > Documentation/merge-strategies.txt | 5 +++++ > > Makefile | 2 +- > > git-merge-ff.sh | 8 ++++++++ > > 3 files changed, 14 insertions(+), 1 deletions(-) > > create mode 100644 git-merge-ff.sh > > git-merge-ff.sh should be executable, added to .gitignore and the > strategy should be added to the available strategies. > > And somehow it did not work for me at all: > > % git merge -s ff origin/master > git-merge.sh: needs update > Trying really trivial in-index merge... > Wonderful. > In-index merge > [..] > % git show HEAD|grep Merge > Merge: 117a93c... f578825... > Merge commit 'origin/master' To prevent something like this to happen, may I suggest adding a really simple, small test case? Ciao, Dscho ^ permalink raw reply [flat|nested] 6+ messages in thread
* a bunch of outstanding updates
@ 2007-06-30 8:56 Sam Vilain
2007-06-30 8:56 ` [PATCH] repack: improve documentation on -a option Sam Vilain
0 siblings, 1 reply; 6+ messages in thread
From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Following up to this e-mail are a whole load of outstanding feature
requests of mine.
These changes are relatively mundane:
* repack: improve documentation on -a option
* git-remote: document -n
* git-remote: allow 'git-remote fetch' as a synonym for 'git fetch'
* git-svn: use git-log rather than rev-list | xargs cat-file
* git-svn: cache max revision in rev_db databases
This one will impact on the version displayed by "git --version", but
I think this is for the better:
* GIT-VERSION-GEN: don't convert - delimiter to .'s
These ones are really only very minor updates based on feedback so
far:
* git-merge-ff: fast-forward only merge
* git-mergetool: add support for ediff
This one is just the previously posted hook script put into the
templates directory, let me know if you'd rather I reshaped it to go
into contrib/hooks:
* contrib/hooks: add post-update hook for updating working copy
This one probably needs a bit more consideration and review, could
perhaps sit on pu.
* git-repack: generational repacking (and example hook script)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] repack: improve documentation on -a option 2007-06-30 8:56 a bunch of outstanding updates Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 8:56 ` [PATCH] git-svn: use git-log rather than rev-list | xargs cat-file Sam Vilain 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain Some minor enhancements to the git-repack manual page. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- Documentation/git-repack.txt | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index c33a512..be8e5f8 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -14,7 +14,8 @@ DESCRIPTION ----------- This script is used to combine all objects that do not currently -reside in a "pack", into a pack. +reside in a "pack", into a pack. It can also be used to re-organise +existing packs into a single, more efficient pack. A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an @@ -28,11 +29,13 @@ OPTIONS -a:: Instead of incrementally packing the unpacked objects, - pack everything available into a single pack. + pack everything referenced into a single pack. Especially useful when packing a repository that is used - for private development and there is no need to worry - about people fetching via dumb file transfer protocols - from it. Use with '-d'. + for private development and there no need to worry + about people fetching via dumb protocols from it. Use + with '-d'. This will clean up the objects that `git prune` + leaves behind, but `git fsck-objects --full` shows as + dangling. -d:: After packing, if the newly created packs make some -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] git-svn: use git-log rather than rev-list | xargs cat-file 2007-06-30 8:56 ` [PATCH] repack: improve documentation on -a option Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 8:56 ` [PATCH] git-svn: cache max revision in rev_db databases Sam Vilain 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain, Sam Vilain From: Sam Vilain <sam@vilain.net> This saves a bit of time when rebuilding the git-svn index. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- git-svn.perl | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 3033b50..556cd7d 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -782,12 +782,12 @@ sub read_repo_config { sub extract_metadata { my $id = shift or return (undef, undef, undef); - my ($url, $rev, $uuid) = ($id =~ /^git-svn-id:\s(\S+?)\@(\d+) + my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+) \s([a-f\d\-]+)$/x); if (!defined $rev || !$uuid || !$url) { # some of the original repositories I made had # identifiers like this: - ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/); + ($rev, $uuid) = ($id =~/^\s*git-svn-id:\s(\d+)\@([a-f\d\-]+)/); } return ($url, $rev, $uuid); } @@ -799,10 +799,16 @@ sub cmt_metadata { sub working_head_info { my ($head, $refs) = @_; - my ($fh, $ctx) = command_output_pipe('rev-list', $head); - while (my $hash = <$fh>) { - chomp($hash); - my ($url, $rev, $uuid) = cmt_metadata($hash); + my ($fh, $ctx) = command_output_pipe('log', $head); + my $hash; + while (<$fh>) { + if ( m{^commit ($::sha1)$} ) { + unshift @$refs, $hash if $hash and $refs; + $hash = $1; + next; + } + next unless s{^\s*(git-svn-id:)}{$1}; + my ($url, $rev, $uuid) = extract_metadata($_); if (defined $url && defined $rev) { if (my $gs = Git::SVN->find_by_url($url)) { my $c = $gs->rev_db_get($rev); @@ -812,7 +818,6 @@ sub working_head_info { } } } - unshift @$refs, $hash if $refs; } command_close_pipe($fh, $ctx); (undef, undef, undef, undef); @@ -2019,16 +2024,19 @@ sub rebuild { return; } print "Rebuilding $db_path ...\n"; - my ($rev_list, $ctx) = command_output_pipe("rev-list", $self->refname); + my ($log, $ctx) = command_output_pipe("log", $self->refname); my $latest; my $full_url = $self->full_url; remove_username($full_url); my $svn_uuid; - while (<$rev_list>) { - chomp; - my $c = $_; - die "Non-SHA1: $c\n" unless $c =~ /^$::sha1$/o; - my ($url, $rev, $uuid) = ::cmt_metadata($c); + my $c; + while (<$log>) { + if ( m{^commit ($::sha1)$} ) { + $c = $1; + next; + } + next unless s{^\s*(git-svn-id:)}{$1}; + my ($url, $rev, $uuid) = ::extract_metadata($_); remove_username($url); # ignore merges (from set-tree) @@ -2046,7 +2054,7 @@ sub rebuild { $self->rev_db_set($rev, $c); print "r$rev = $c\n"; } - command_close_pipe($rev_list, $ctx); + command_close_pipe($log, $ctx); print "Done rebuilding $db_path\n"; } -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] git-svn: cache max revision in rev_db databases 2007-06-30 8:56 ` [PATCH] git-svn: use git-log rather than rev-list | xargs cat-file Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 8:56 ` [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s Sam Vilain 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain, Sam Vilain From: Sam Vilain <sam@vilain.net> Cache the maximum revision for each rev_db URL rather than looking it up each time. This saves a lot of time when rebuilding indexes on a freshly cloned repository. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- git-svn.perl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 556cd7d..a8b6669 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -801,6 +801,7 @@ sub working_head_info { my ($head, $refs) = @_; my ($fh, $ctx) = command_output_pipe('log', $head); my $hash; + my %max; while (<$fh>) { if ( m{^commit ($::sha1)$} ) { unshift @$refs, $hash if $hash and $refs; @@ -810,11 +811,14 @@ sub working_head_info { next unless s{^\s*(git-svn-id:)}{$1}; my ($url, $rev, $uuid) = extract_metadata($_); if (defined $url && defined $rev) { + next if $max{$url} and $max{$url} < $rev; if (my $gs = Git::SVN->find_by_url($url)) { my $c = $gs->rev_db_get($rev); if ($c && $c eq $hash) { close $fh; # break the pipe return ($url, $rev, $uuid, $gs); + } else { + $max{$url} ||= $gs->rev_db_max; } } } -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s 2007-06-30 8:56 ` [PATCH] git-svn: cache max revision in rev_db databases Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 8:56 ` [PATCH] git-remote: document -n Sam Vilain 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain Otherwise, a custom "v1.5.2.42.gb1ff" is considered newer than a "v1.5.2.1.69.gcafe" Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- GIT-VERSION-GEN | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 06c360b..ac6a062 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -18,7 +18,7 @@ elif test -d .git && v[0-9]*) : happy ;; esac then - VN=$(echo "$VN" | sed -e 's/-/./g'); + :; else VN="$DEF_VER" fi -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] git-remote: document -n 2007-06-30 8:56 ` [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 8:56 ` [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' Sam Vilain 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain, Sam Vilain From: Sam Vilain <sam@vilain.net> The 'show' and 'prune' commands accept an option '-n'; document what it does. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- Documentation/git-remote.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index ab232c2..61a6022 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -49,6 +49,9 @@ branch the `HEAD` at the remote repository actually points at. 'show':: Gives some information about the remote <name>. ++ +With `-n` option, the remote heads are not queried first with +`git ls-remote <name>`; cached information is used instead. 'prune':: @@ -56,6 +59,10 @@ Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>". ++ +With `-n` option, the remote heads are not confirmed first with `git +ls-remote <name>`; cached information is used instead. Use with +caution. 'update':: -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' 2007-06-30 8:56 ` [PATCH] git-remote: document -n Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 8:56 ` [PATCH] git-merge-ff: fast-forward only merge Sam Vilain 0 siblings, 1 reply; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain, Sam Vilain From: Sam Vilain <sam@vilain.net> I found myself typing this when doing remote-like things. Perhaps other people will find this useful Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- Documentation/git-remote.txt | 4 ++++ git-remote.perl | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 61a6022..b462ccd 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -64,6 +64,10 @@ With `-n` option, the remote heads are not confirmed first with `git ls-remote <name>`; cached information is used instead. Use with caution. +'fetch':: + +Synonym for `git fetch <name>`, and accepts all the same options. + 'update':: Fetch updates for a named set of remotes in the repository as defined by diff --git a/git-remote.perl b/git-remote.perl index b59cafd..2c60cae 100755 --- a/git-remote.perl +++ b/git-remote.perl @@ -404,11 +404,15 @@ elsif ($ARGV[0] eq 'add') { } add_remote($ARGV[1], $ARGV[2], \%opts); } +elsif ($ARGV[0] eq 'fetch') { + exec("git-fetch", @ARGV[1..$#ARGV]); +} else { print STDERR "Usage: git remote\n"; print STDERR " git remote add <name> <url>\n"; print STDERR " git remote show <name>\n"; print STDERR " git remote prune <name>\n"; print STDERR " git remote update [group]\n"; + print STDERR " git remote fetch <fetch-options> <repository> <refspec>...\n"; exit(1); } -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] git-merge-ff: fast-forward only merge 2007-06-30 8:56 ` [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' Sam Vilain @ 2007-06-30 8:56 ` Sam Vilain 2007-06-30 14:28 ` Johannes Schindelin 2007-06-30 18:32 ` Matthias Lederhofer 0 siblings, 2 replies; 6+ messages in thread From: Sam Vilain @ 2007-06-30 8:56 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Sam Vilain This is primarily so that there is an easy switch to 'git-pull' to be sure to fast forward only. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> --- Documentation/merge-strategies.txt | 5 +++++ Makefile | 2 +- git-merge-ff.sh | 8 ++++++++ git-merge.sh | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 git-merge-ff.sh diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 7df0266..00739bc 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -33,3 +33,8 @@ ours:: merge is always the current branch head. It is meant to be used to supersede old development history of side branches. + +ff:: + This is a degenerate merge strategy that always fails, which + means that the only time the target branch will change is if + there was no merge ("fast-forward" merge only). diff --git a/Makefile b/Makefile index 4ea5e45..7fa8fe3 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ SCRIPT_SH = \ git-tag.sh git-verify-tag.sh \ git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ - git-merge-resolve.sh git-merge-ours.sh \ + git-merge-resolve.sh git-merge-ours.sh git-merge-ff.sh \ git-lost-found.sh git-quiltimport.sh git-submodule.sh \ git-filter-branch.sh diff --git a/git-merge-ff.sh b/git-merge-ff.sh new file mode 100644 index 0000000..b0e0f85 --- /dev/null +++ b/git-merge-ff.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +# Copyright (c) 2007 Sam Vilain +# +# A degenerate merge strategy that only allows fast-forwarding. +# + +exit 1; diff --git a/git-merge.sh b/git-merge.sh index 981d69d..63aa374 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -16,10 +16,10 @@ test -z "$(git ls-files -u)" || LF=' ' -all_strategies='recur recursive octopus resolve stupid ours subtree' +all_strategies='recur recursive octopus resolve stupid ours subtree ff' default_twohead_strategies='recursive' default_octopus_strategies='octopus' -no_trivial_merge_strategies='ours subtree' +no_trivial_merge_strategies='ours subtree ff' use_strategies= index_merge=t -- 1.5.2.1.1131.g3b90 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-merge-ff: fast-forward only merge 2007-06-30 8:56 ` [PATCH] git-merge-ff: fast-forward only merge Sam Vilain @ 2007-06-30 14:28 ` Johannes Schindelin 2007-06-30 18:32 ` Matthias Lederhofer 1 sibling, 0 replies; 6+ messages in thread From: Johannes Schindelin @ 2007-06-30 14:28 UTC (permalink / raw) To: Sam Vilain; +Cc: Junio C Hamano, git Hi, On Sat, 30 Jun 2007, Sam Vilain wrote: > Documentation/merge-strategies.txt | 5 +++++ > Makefile | 2 +- > git-merge-ff.sh | 8 ++++++++ > git-merge.sh | 4 ++-- Still no test script that could tell you if it does what it is supposed to be... Ciao, Dscho ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-merge-ff: fast-forward only merge 2007-06-30 8:56 ` [PATCH] git-merge-ff: fast-forward only merge Sam Vilain 2007-06-30 14:28 ` Johannes Schindelin @ 2007-06-30 18:32 ` Matthias Lederhofer 1 sibling, 0 replies; 6+ messages in thread From: Matthias Lederhofer @ 2007-06-30 18:32 UTC (permalink / raw) To: Sam Vilain; +Cc: git Sam Vilain <sam.vilain@catalyst.net.nz> wrote: > This is primarily so that there is an easy switch to 'git-pull' to > be sure to fast forward only. Is this still broken or am I just doing something totally wrong? % git reset --hard origin/master~15 HEAD is now at e1341ab... Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk % git merge -s ff origin/master Automatic merge failed; fix conflicts and then commit the result. [1] 19368 exit 1 git merge -s ff origin/master % git merge origin/master Updating e1341ab..7c85173 Fast forward [..] 23 files changed, 236 insertions(+), 79 deletions(-) ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-06-30 18:32 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-06-26 4:01 [PATCH] git-merge-ff: fast-forward only merge Sam Vilain 2007-06-28 11:33 ` Matthias Lederhofer 2007-06-28 13:01 ` Johannes Schindelin -- strict thread matches above, loose matches on Subject: below -- 2007-06-30 8:56 a bunch of outstanding updates Sam Vilain 2007-06-30 8:56 ` [PATCH] repack: improve documentation on -a option Sam Vilain 2007-06-30 8:56 ` [PATCH] git-svn: use git-log rather than rev-list | xargs cat-file Sam Vilain 2007-06-30 8:56 ` [PATCH] git-svn: cache max revision in rev_db databases Sam Vilain 2007-06-30 8:56 ` [PATCH] GIT-VERSION-GEN: don't convert - delimiter to .'s Sam Vilain 2007-06-30 8:56 ` [PATCH] git-remote: document -n Sam Vilain 2007-06-30 8:56 ` [PATCH] git-remote: allow 'git-remote fetch' as a synonym for 'git fetch' Sam Vilain 2007-06-30 8:56 ` [PATCH] git-merge-ff: fast-forward only merge Sam Vilain 2007-06-30 14:28 ` Johannes Schindelin 2007-06-30 18:32 ` Matthias Lederhofer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).