projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47c4128
)
fix name typo
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 19:33:55 +0000
(21:33 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 19:33:55 +0000
(21:33 +0200)
all
patch
|
blob
|
history
diff --git
a/all
b/all
index
b4f38b8
..
6afd6df
100755
(executable)
--- a/
all
+++ b/
all
@@
-256,7
+256,7
@@
case "$cmd" in
r=${r#refs/heads/}
if git config branch.$r.remote >/dev/null 2>&1; then
if ! verbose git pull; then
- fix_upstream_rebase_mergefail
ed
|| true
+ fix_upstream_rebase_mergefail || true
check_mergeconflict "$d"
echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
read -r DUMMY