repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Be more user-friendly when refusing to do something because of conflict.
2010-01-12
Matth
i
eu Moy
Be more
u
ser-friendly
w
h
en refusing to do someth
i
ng
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
built
i
n-
m
erge: show
u
s
er-fr
i
e
n
dly error messages
for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thieu Moy
merge-recursive: m
a
ke the error-mess
a
ge
generation
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Mo
y
u
ser-man
u
a
l
:
Document t
h
at "git me
r
ge
"
does
n
't l
i
k
e
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Mat
t
hieu Moy
merge-r
e
curs
i
ve: point the u
s
er to c
o
mmit when file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
ex
p
a
nd_u
s
e
r_path: e
x
pand ~ to
$HOME, not to the ac
t
ual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matth
i
eu Moy
Expan
d
~ and
~u
s
e
r
i
n core
.
excludes
f
ile, com
m
it
.
t
e
mp
l
ate
...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
Matthieu Moy
pu
s
h
: C
o
r
rec
t
l
y
in
i
tializ
e
nonfas
t
forward in
t
ransport_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Ma
t
thieu Moy
wrap git's main u
s
ag
e
string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Matthi
e
u Mo
y
stas
h
: s
i
mplify defau
l
t
ing to "save" and reject unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Ma
t
thi
e
u
Moy
r
eset: make the r
e
minder
outp
u
t
consistent
with "checkout
"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
Rena
m
e
R
EFRESH
_
SAY_C
H
ANGED to REFRESH_I
N
_PORCEL
A
IN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu
M
oy
filter-branch
:
make the usage string fit on 8
0
chars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
M
atthieu Moy
push
:
point to
'git pull' and 'g
i
t push --for
c
e' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
M
a
tt
h
ieu Moy
Show
u
sage string f
o
r 'g
i
t log -h',
'git show -h
'
and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
git-ls-files
.
t
xt
:
clar
i
fy what
"other files"
m
ean fo
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Ma
t
thieu
M
oy
r
e
base: consistent error
m
e
ss
a
g
e
s
f
o
r
s
tag
e
d
a
nd unstag
e
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthieu Moy
Better usage
s
tr
i
ng
f
or reflo
g
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
M
a
t
thieu Moy
clon
e
: add test for push on an empty clo
n
e
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Ma
t
thieu Moy
Update
g
it-add
.
t
xt according t
o
the new possibilit
i
es
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Mat
t
hieu
M
oy
git add -p
:
new "quit" comm
a
nd at
the promp
t
.
commit
|
commitdiff
|
tree
2009-04-16
Mat
t
hieu Moy
Update git-add
.
txt according to the
new
p
o
ssibili
t
ies
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
Matth
i
eu Moy
git add -p: new "q
u
it" command at the
promp
t
.
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu Moy
git-p
u
ll
.
sh: better warni
n
g m
e
s
s
age for "
g
it
p
u
ll"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
Moy
g
it-rev-l
i
st
.
txt: make ascii marku
p
uniform
with other
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthi
e
u Mo
y
gi
t
-send-
e
mail
.
txt: clarify whic
h
options take
an argum
e
nt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Moy
g
it
-
checkout
.
txt: clarify that <b
r
anch
>
appli
e
s when
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu M
o
y
gi
t
-checkout
.
txt: fix incorrect statem
e
n
t
about HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Mat
t
hieu Moy
More friendly m
e
ssa
g
e
when
l
ocking the inde
x
fai
l
s
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matt
h
ieu
M
oy
Documen
t
git bla
m
e --reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
M
atthieu Moy
bu
i
lti
n
-mv
.
c:
ch
e
ck fo
r
u
n
v
e
r
sionned files before
looking
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Mat
t
hieu Moy
Add a
t
estcase f
o
r "git
mv -f" on untracked files
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu M
o
y
Mis
s
ing
&& in
t/t7001
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Matthieu Moy
g
i
t-svn
:
detect and fail
g
rac
e
ful
l
y when
d
commi
t
t
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthieu M
o
y
D
ocu
m
ent that WebD
A
V
d
oesn't need git on the serv
e
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Ma
t
thieu
M
oy
Fix
i
n
correct wording in
g
it-
m
erge
.
t
x
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
M
atthieu Moy
Doc fix
for git-
r
eflog: men
t
i
on @{
.
.
.
} syntax, an
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
M
att
h
ieu Moy
Add a
n
d docu
m
ent a
g
l
obal --no-p
a
ger
opt
i
on for git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
M
a
tthieu Moy
More
permi
s
si
v
e
"
git-
r
m --cached" beha
v
ior without
-f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
Add
e
d
a r
e
ference
t
o
git-add in th
e
doc
u
menta
t
ion for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
D
o
c
ument
g
it ad
d
-u intr
o
duced earlie
r
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree