mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-09 02:33:11 +01:00
Code Activity
10725 commits 6 branches 956 tags 506 MiB
Commit graph

536 commits

Author SHA1 Message Date
Han-Wen Nienhuys
b17f88b544 remove debug print 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 12:40:24 -03:00
Han-Wen Nienhuys
86dff6b676 Cleanups & import into p4/master for local import 
- import into master/local if --import-local is set

- use Die() for exiting

- if --verbose is set, raise Exception()

- use joined strings iso. `list` for progress printing

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 12:38:30 -03:00
Han-Wen Nienhuys
d2c6dd30ef use p4CmdList() to get file contents in Python dicts. This is more robust. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-31 11:29:25 -03:00
Han-Wen Nienhuys
f2eda79f69 only run p4 print if necessary 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 18:50:41 -03:00
Han-Wen Nienhuys
982bb8a303 don't p4 print deleted files. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 17:33:18 -03:00
Han-Wen Nienhuys
96e07dd23c read files before creating the commit. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:57:59 -03:00
Han-Wen Nienhuys
a3287be5bc thinko. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:38:32 -03:00
Han-Wen Nienhuys
183b8ef89b store p4 user cache in home directory. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:35:32 -03:00
Han-Wen Nienhuys
9320da8dd4 Thinko, fix buglet. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:22:57 -03:00
Han-Wen Nienhuys
6a49f8e2e0 Read p4 files in one batch. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 16:21:46 -03:00
Han-Wen Nienhuys
b86f73782e remove global .gitdir 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 13:58:19 -03:00
Han-Wen Nienhuys
5e926eed9f Merge origin. 2007-05-30 13:46:25 -03:00
Han-Wen Nienhuys
bb6e09b27a Diverse cleanups 
- print commands with \n

- extractDepotPathsAndChangeFromGitLog -> extractSettings, returning
dict.

- store keepRepoPath in [git-p4: ] line

- create a main() function, so git-p4 can be pychecked

- use --destination for clone destination. This simplifies logic
for --keep-path

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-30 13:44:15 -03:00
Shawn O. Pearce
2e4aef5893 Allow contrib new-workdir to link into bare repositories 
On one particular system I like to keep a cluster of bare Git
repositories and spawn new-workdirs off of them.  Since the bare
repositories don't have working directories associated with them
they don't have a .git/ subdirectory that hosts the repository we
are linking to.

Using a bare repository as the backing repository for a workdir
created by this script does require that the user delete core.bare
from the repository's configuration file, so that Git auto-senses
the bareness of a repository based on pathname information, and
not based on the config file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-05-29 00:27:21 -07:00
Simon Hausmann
cfeb59be25 Fix typo in listExistingP4Branches that broke sync. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-28 19:24:57 +02:00
Simon Hausmann
9226c03c32 In *_pipe print the command that failed if it fails. 
Fixed old calls to mypopen.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-28 19:23:19 +02:00
Han-Wen Nienhuys
6326aa5866 Extract multiple paths concurrently. 
This enables importing just the interesting bits of large
repositories.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 12:50:04 -03:00
Han-Wen Nienhuys
4addad2291 add --verbose to all commands. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:45:26 -03:00
Han-Wen Nienhuys
b25b20656d use strip() iso. slicing for removing \n 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:20:50 -03:00
Han-Wen Nienhuys
b76f0565bf use string.strip() iso. slicing. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:19:10 -03:00
Han-Wen Nienhuys
8b41a97f8a clone and sync --keep-path to keep perforce path to module. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:18:31 -03:00
Han-Wen Nienhuys
6754a299d8 minor cleanups 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:17:27 -03:00
Han-Wen Nienhuys
bce4c5fc0b cleanup 
- use re.sub() iso. if for stripping ...
- spacing nits

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:15:43 -03:00
Han-Wen Nienhuys
b016d39756 Robustness fixes for pipes 
- add read_pipe(), read_pipe_lines(), write_pipe(), which
check pipe.close()

- use throughout

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 11:15:29 -03:00
Simon Hausmann
c8cbbee980 Fix my email address, this isn't really KDE related :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-28 14:43:25 +02:00
Han-Wen Nienhuys
7cb5cbefd2 rename apply() to applyCommit(); apply is a python builtin 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 14:29:11 +02:00
Han-Wen Nienhuys
cebdf5af31 reformatting: break long lines. 
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 14:28:58 +02:00
Han-Wen Nienhuys
ce6f33c835 Cleanups 
- don't use dir (python builtin)
- use re for munging depotPath into destination

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
 2007-05-28 14:22:53 +02:00
Simon Hausmann
a3c55c09ec Fix creation of refs/remotes/p4/HEAD symbolic ref 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-27 15:48:01 +02:00
Simon Hausmann
cb4f1280dd Added git-p4 submit --trust-me-like-a-fool for the adventurous users :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-25 22:34:30 +02:00
Simon Hausmann
877db584aa Forgot to remove this TODO item when I made --with-origin the default :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-25 19:43:38 +02:00
Simon Hausmann
d414c74afd Shortcut the case where we have no origin branch 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-25 11:36:42 +02:00
Simon Hausmann
01265103fe Make --with-origin the default for syncing. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-25 10:36:10 +02:00
Simon Hausmann
417a7a6fc8 Make --with-origin also work without origin :) 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-25 10:28:46 +02:00
Simon Hausmann
4280e53333 Make git-p4 work with packed refs (don't use os.path.exists to check for the 
existance of a ref)

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-25 08:49:18 +02:00
Simon Hausmann
65c5f3e3f2 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-25 08:44:41 +02:00
Simon Hausmann
10f880f8d4 Oops, fix --with-origin to /really/ also call git fetch :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-24 22:28:28 +02:00
Simon Hausmann
abcd790fe9 Added support for --with-origin with multi-branch imports 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-24 22:25:36 +02:00
Simon Hausmann
2cc58fd99a Forgot to remove this return statement from debugging 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-24 22:10:40 +02:00
Simon Hausmann
d1874ed33b Fix creating the remotes/p4 branches based on origin/* for the multi-branch import 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-24 21:23:04 +02:00
Marius Storm-Olsen
c1f9197f37 Replace \r\n with \n when importing from p4 on Windows 
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
 2007-05-24 14:17:29 +02:00
Shawn O. Pearce
12977705b3 Update bash completion for git-config options 
A few new configuration options grew out of the woodwork during the
1.5.2 series.  Most of these are pretty easy to support a completion
of, so we do so.

I wanted to also add completion support for the <driver> part of
merge.<driver>.name but to do that we have to look at all of the
.gitattributes files and guess what the unique set of <driver>
strings would be.  Since this appears to be non-trivial I'm punting
on it at this time.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 02:07:45 -04:00
Shawn O. Pearce
8f87fae645 Teach bash completion about recent log long options 
(Somewhat) recently git-log learned about --reverse (to show commits
in the opposite order) and a looong time ago I think it learned
about --raw (to show the raw diff, rather than a unified diff).
These are both useful options, so we should make them easy for the
user to complete.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 01:51:30 -04:00
Shawn O. Pearce
fb72759b7d Teach bash completion about 'git remote update' 
Recently the git-remote command grew an update subcommand, which
can be used to execute git-fetch across multiple repositories
in a single step.  These can be configured with the 'remotes.*'
configuration options, so we can offer completion for any name that
matches and appears to be useful to git-remote update.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 01:46:49 -04:00
Shawn O. Pearce
c70680ce7c Update bash completion header documentation 
1) Added a note about supporting the long options for most commands,
    as we have been doing so for quite some time.

 2) Include a notice that these routines are covered by the GPL,
    as that may not be obvious, even though they are distributed
    as part of the core Git distribution.

 3) Added a short section on how to send patches to the routines,
    and to whom they should get sent to.  Currently that is me,
    as I am the active maintainer.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 01:36:46 -04:00
Shawn O. Pearce
bfbd131f52 Remove a duplicate --not option in bash completion 
This was just me being silly; I put the --not option into the
completion list twice.  There's no duplicates shown in the shell
as the shell removes them before showing them to the user.  But we
really don't need the duplicates in the source script either.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 01:26:58 -04:00
Shawn O. Pearce
1fd6bec9bc Teach bash completion about git-shortlog 
We've had completion for git-log for quite some time, but just
today I noticed we don't have it for the new builtin shortlog
that runs git-log internally.  This is indeed a handy thing to
have completion for, especially when your branch names are of
the Very-Very-Long-and-Hard/To-Type/Variety/That-Some-Use.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 01:25:34 -04:00
Shawn O. Pearce
5cfb4fe525 Hide the plumbing diff-{files,index,tree} from bash completion 
The diff-* programs are meant to be plumbing for the diff frontend;
most end users aren't invoking these commands directly.  Consequently
we should avoid showing them as possible completions.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-24 01:10:15 -04:00
Simon Hausmann
ebd8116870 Load the user map from p4 only once at run-time. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-24 00:24:52 +02:00
Simon Hausmann
b3fd1b2808 Fix multi-branch import with --silent. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:53:14 +02:00
Simon Hausmann
ad192f2888 Fix p4 execution in git-p4 rollback. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:44:19 +02:00
Simon Hausmann
66a2f52395 Catch p4 errors in rollback early enough (before deleting refs!) 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:40:48 +02:00
Simon Hausmann
ac3e0d79ee Oops, fill the /list/ correct with the p4 exit code. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:32:32 +02:00
Simon Hausmann
a6d5da36af Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed. 
When the p4 command failed write out the exit code in the returned dict.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 23:29:01 +02:00
Simon Hausmann
0c66a78393 Make rollback work with locally imported branches 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 20:07:57 +02:00
Simon Hausmann
65d2ade95e Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash) 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 16:41:46 +02:00
Simon Hausmann
a396b29267 Doc updates 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-23 00:33:34 +02:00
Simon Hausmann
57284050a8 Use refs/heads/* instead of refs/heads/p4/* for local imports 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 00:15:50 +02:00
Simon Hausmann
01a9c9c5a8 Added support for --max-changes=<count> to ease import debugging 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 00:07:35 +02:00
Simon Hausmann
a028a98e9a Added support for importing multiple branches into refs/heads instead of just refs/remotes 
using --import-local. Needs some further microfix but seems to work otherwise.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-23 00:03:08 +02:00
Simon Hausmann
52102d4784 Fixes for rollback, delete branches that did not exist at the specified p4 change 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 23:44:24 +02:00
Simon Hausmann
af8da89cb7 Fix branch detection in multi-branch imports 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 23:25:51 +02:00
Simon Hausmann
5834684d51 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 22:57:06 +02:00
Simon Hausmann
7944f1425c Make git-p4 submit --direct safer by also creating a git commit 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 11:04:26 +02:00
Simon Hausmann
cbf5efa61a Detect with git-p4 submit --direct when there are no changes in the working directory 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 10:08:11 +02:00
Simon Hausmann
faf1bd2026 Fix git symbolic-ref warning on initial clone 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 10:05:30 +02:00
Simon Hausmann
dc52403696 Fix error detection with git-p4 submit when the requested depot path is not in the client view. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 09:34:56 +02:00
Simon Hausmann
33be3e6550 Fix conversion from old style heads/p4 to remotes/p4/master 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-21 08:44:16 +02:00
Jonas Fonseca
56d99c67d1 Update bash completion to ignore some more plumbing commands 
[sp: Modified Jonas' original patch to keep checkout-index
 as a a valid completion.]

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-21 02:09:26 -04:00
Simon Hausmann
341dc1c179 Improved output for multi branch imports and noted another little todo item 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-21 00:39:16 +02:00
Simon Hausmann
b1561ee256 Another (potentially life-saving) idea for submit --direct 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 23:52:51 +02:00
Simon Hausmann
24f7b53fdd Had an idea for debugging, record it :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 23:42:22 +02:00
Simon Hausmann
8a5fc95b43 Specifying --detect-branches is now only needed for the initial clone/sync. 
Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master
are found.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-20 23:39:40 +02:00
Simon Hausmann
c1b296b9f1 Added support for git-p4 submit --direct (experimental) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 16:55:05 +02:00
Simon Hausmann
47a130b7bf Use git format-patch and git apply --apply when extracting patches from git and 
applying them to a Perforce checkout. This should make it possible to apply git
commits with binary files that cannot be handled by path.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 16:33:21 +02:00
Simon Hausmann
64ffb06a9c Oops, not only /set/ gitdir on clone, also set it /correctly/ :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 15:24:01 +02:00
Simon Hausmann
59fa417109 Fix gitdir not being set when cloning. Needed for writing the p4 users cache. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 15:15:34 +02:00
Simon Hausmann
b607e71efd Cache the output of "p4 users" for faster syncs on high latency links. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-20 10:55:54 +02:00
Simon Hausmann
9bda3a8556 Removed unused variable, more cleanups 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-19 12:05:40 +02:00
Simon Hausmann
71b112d4a4 More cleanups and speedups for labels and branches 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-19 11:54:11 +02:00
Simon Hausmann
d5904674d1 Cleanup/speed up the branch<> file split and removed change range limitation that I added 
for debugging (oops).

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-19 11:07:32 +02:00
Simon Hausmann
29bdbac1cd More work on the incremental importing of multiple branches. 
Improved error detection by checking the exit code of git-fast-import.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-19 10:23:12 +02:00
Simon Hausmann
8f9b2e082b Give branches a nice project prefix and don't bail out on clone if we failed 
to detect the master branch.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-18 22:13:26 +02:00
Simon Hausmann
4b97ffb1e4 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo". 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-18 21:45:23 +02:00
Simon Hausmann
66c6a9b559 Removed unused cache variables. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-18 20:39:38 +02:00
Simon Hausmann
05094f987c Fix branch setup after initial clone. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-18 20:32:35 +02:00
Simon Hausmann
71bd9bacec Removed todo item that is implemented :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 22:22:26 +02:00
Simon Hausmann
ef48f9093c Added support for git-p4 sync/rebase --with-origin. See git-p4.txt for details :) 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 22:17:49 +02:00
Simon Hausmann
48df6fd850 Bite the bullet and automatically convert old style refs/heads/p4 repositories 
to the new style refs/remotes/p4 branching.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 21:18:53 +02:00
Simon Hausmann
c6d44cb1a1 Changed the default p4 import branch to be refs/remotes/p4/{HEAD,master} 
instead of refs/heads/p4.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 20:57:05 +02:00
Simon Hausmann
8ead4fda3f Create the origin based import branch using git update-ref instead of git branch 
so that it's possible to have the import branch in refs/remotes.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 20:26:58 +02:00
Simon Hausmann
1c9d393d30 Removed ancient and unused code to find the last imported revision from previous imports 
to use for the current import by looking at the p4 tags. The current approach of using
the log message works better.

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 20:15:47 +02:00
Simon Hausmann
8a2820def4 Removed cleantags command. It doesn't have any meaning anymore. 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 19:44:50 +02:00
Simon Hausmann
463e8af655 Clean up code duplication for revision parsing and fix previous commit to not 
import into remotes/p4 (yet!).

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 09:13:54 +02:00
Simon Hausmann
f9162f6a4c Always pass a sha1 for the initial parent so that git-fast-import doesn't think 
it's creating a new branch from itself. It's a sensible error in general but
in the case of incremental imports we have to apply force :)

Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 09:09:05 +02:00
Simon Hausmann
5c4153e488 Fixing syncing (gitdir discovery / cd) for bare repositories 
Signed-off-by: Simon Hausmann <simon@lst.de>
 2007-05-17 07:42:38 +02:00
Junio C Hamano
fdcb769916 Merge branch 'maint' 
* maint:
  format-patch: add MIME-Version header when we add content-type.
  Fixed link in user-manual
  import-tars: Use the "Link indicator" to identify directories
  git name-rev writes beyond the end of malloc() with large generations
  Documentation/branch: fix small typo in -D example
 2007-05-16 12:43:05 -07:00
Johannes Schindelin
df8cfac815 import-tars: Use the "Link indicator" to identify directories 
Earlier, we used the mode to determine if a name was associated with
a directory. This fails, since some tar programs do not set the mode
correctly. However, the link indicator _has_ to be set correctly.

Noticed by Chris Riddoch.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
 2007-05-16 14:54:22 -04:00
Simon Hausmann
ca0affe7bb A little todo note before I forget it :), based on a suggestion from Lars. 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-16 13:15:34 +02:00
Simon Hausmann
dc1a93b6dc Fix calling git-p4 rebase from within a subdirectory (git rebase wants to be in toplevel) 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
 2007-05-16 12:12:39 +02:00