diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-30 23:42:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-30 23:42:10 -0700 |
| commit | c1a788aceecb0a8e95d6442938ade9ca43df033e (patch) | |
| tree | 30d99ae60a57281f75586d64f9853429fa3d26e7 /builtin-push.c | |
| parent | f59aac47f3839367d0da04019b0fc2bd61345225 (diff) | |
| parent | 076b0adcf9dac7bd9d18624087f679cc811aeb77 (diff) | |
| download | git-c1a788aceecb0a8e95d6442938ade9ca43df033e.tar.gz git-c1a788aceecb0a8e95d6442938ade9ca43df033e.tar.xz | |
Merge branch 'js/read-tree' into js/c-merge-recursive
* js/read-tree: (107 commits)
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
tar-tree: illustrate an obscure feature better
git.c: allow alias expansion without a git directory
setup_git_directory_gently: do not barf when GIT_DIR is given.
Build on Debian GNU/kFreeBSD
Call setup_git_directory() much earlier
Call setup_git_directory() early
Display an error from update-ref if target ref name is invalid.
Fix http-fetch
t4103: fix binary patch application test.
git-apply -R: binary patches are irreversible for now.
Teach git-apply about '-R'
Makefile: ssh-pull.o depends on ssh-fetch.c
log and diff family: honor config even from subdirectories
git-reset: detect update-ref error and report it.
lost-found: use fsck-objects --full
Teach git-http-fetch the --stdin switch
Teach git-local-fetch the --stdin switch
Make pull() support fetching multiple targets at once
...
Diffstat (limited to 'builtin-push.c')
| -rw-r--r-- | builtin-push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-push.c b/builtin-push.c index 31cbfd738..a82417106 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -270,7 +270,7 @@ static int do_push(const char *repo) return 0; } -int cmd_push(int argc, const char **argv, char **envp) +int cmd_push(int argc, const char **argv, const char *prefix) { int i; const char *repo = "origin"; /* default repository */ |