repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/maint-pull-rebase-error-message' into maint
2009-11-23
Matthieu Moy
user-man
u
al: Document that "git merge
"
does
n
'
t
l
i
ke
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Ma
t
thieu Moy
merge-
r
ecur
s
ive: point the user to co
m
mit when f
i
le
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Ma
t
thieu M
o
y
expan
d
_us
e
r
_
path: expand ~ to $HOME, not to
the actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Mo
y
Expand ~ and ~user i
n
core
.
excludesfi
l
e
,
c
o
mmit
.
template
...patch by Karl Chen, modified by
Matthieu Moy
, and further
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-20
M
atth
i
eu M
o
y
push: Correctly
i
n
i
t
i
a
lize
nonfast
f
orward in transport_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
M
a
tth
i
eu Moy
wrap git'
s
mai
n
usage s
t
ring
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
M
a
t
thieu
Moy
st
a
sh: simplify d
e
faulting to "
s
a
v
e" and reject unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Ma
t
thieu Moy
r
eset: ma
k
e the
re
m
inder output consis
t
ent with "checkout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthi
e
u Moy
Rename R
E
FRESH_SA
Y
_CHANGED to REFR
E
S
H
_IN_PORCELAIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu
M
o
y
filter-
b
r
a
n
c
h: make the
u
sage str
i
ng fit on 80 chars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Matthieu Moy
push
:
poin
t
to 'git pull' and 'git push --f
o
rce'
i
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matt
h
ieu Moy
Show
us
a
ge string for
'
g
it l
o
g -h',
'
git sho
w
-h' and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Ma
t
t
hieu
Moy
gi
t
-
l
s-files
.
txt: clarify wh
a
t "other f
i
l
e
s" mean
for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
reb
a
se: consis
t
ent
error
mes
s
ages for stag
e
d and
unstaged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
M
atthieu Moy
Better usage string for
reflog
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu Mo
y
clone: add test for push on an e
m
pt
y
clone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
M
a
tthieu Moy
Updat
e
git-
a
dd
.
txt a
c
cording
to the new pos
s
ibilit
i
e
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Mat
t
hieu Moy
git add -p: ne
w
"qui
t
" command at the pro
m
pt
.
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
Upd
a
te g
i
t-a
d
d
.
txt
a
cco
r
ding to
t
he
new
p
o
ssibilitie
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
git add -
p
: new "quit" command
a
t the
prompt
.
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
i
t-pull
.
sh: better
warning message f
o
r "git pull"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matth
i
eu Moy
git-rev-list
.
txt: ma
k
e ascii marku
p
uniform
w
i
th ot
h
e
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Moy
g
i
t-
s
end-
e
mail
.
txt: c
l
arify which options take
a
n argument
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Moy
gi
t
-checkou
t
.
tx
t
: clar
i
f
y
that <bran
c
h
> applie
s
whe
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-che
c
ko
u
t
.
tx
t
:
fix inco
r
rect st
a
tement about
HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
M
ore friendly message
w
h
en
l
ocking the index fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
D
o
cument gi
t
blame --
r
everse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Ma
t
th
i
eu Moy
builtin-mv
.
c
: check for
unversionne
d
file
s
bef
o
r
e
lo
o
k
i
ng
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthi
e
u Moy
Add a t
e
s
t
case for "gi
t
mv -f"
on
untracked fi
l
es
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Ma
t
thieu Moy
Missi
n
g
&
&
in
t
/
t
7001
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Matt
h
ieu Moy
git-
s
vn: det
e
ct and fail
g
r
acefully when dco
m
mitting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Ma
t
thieu Moy
Document that
W
eb
D
AV doe
s
n't need git on the server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matthie
u
Moy
Fix incor
r
ect wording in g
i
t-merge
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
Matthieu Moy
Doc fix
for git-r
e
flog: mention @{
.
.
.
} syntax, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matthieu Mo
y
Ad
d
and do
c
ument a global --no-page
r
opt
i
on for
git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matthieu Moy
Mor
e
p
e
rmissiv
e
"g
i
t-
r
m -
-
cached" beh
a
vi
o
r without -f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu M
o
y
A
dded
a reference to git-add in the documentation for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
Document git add -u introduced earlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree