repo.or.cz
/
git
/
gitster.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
Mat
t
h
i
eu M
o
y
Be more user-f
r
i
e
n
d
l
y when refusing
t
o
do something
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-11-30
M
a
tth
i
e
u
M
oy
builtin
-
merge
:
show us
e
r-friendly error messa
g
es for
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-recursive:
m
a
ke the error-message
g
eneration
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu
M
oy
u
s
er-manua
l
:
Do
c
um
e
nt that "git
m
erg
e
"
doesn't like
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-11-23
Matth
i
eu Moy
merge-recursive: point the user
t
o
c
ommit when file
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Mo
y
e
x
pand
_
u
s
e
r
_path: expand ~ to $HOME, not to
t
h
e actu
a
l
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Moy
Expand ~ and ~us
e
r in c
o
re
.
exclude
s
fil
e
, commit
.
template
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-09-20
Matthieu Moy
push
:
Correctly init
i
alize
n
onfastf
o
rward in transport_p
u
sh
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-09-13
Matt
h
ieu
Moy
w
r
a
p git's
main us
a
ge string
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-09-02
Matthieu Moy
s
t
ash: simplify defaulting to "save"
an
d
reject un
k
nown
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
r
e
set: ma
k
e the reminder output con
s
istent w
i
th "ch
e
ckout
"
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu
Moy
Rename REFRESH_SAY
_
C
HANG
E
D to RE
F
RESH_IN_PORC
E
L
A
IN
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu Moy
f
i
lte
r
-br
a
nch: ma
k
e the usage st
r
ing fit on 80 ch
a
rs
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-12
Ma
t
thieu Moy
push: p
o
int to 'git pull' and 'git push --force' in
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-07
Matthieu Moy
S
h
ow usage string
for 'git lo
g
-h',
'
git show -h' and
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-06
M
atthieu
Moy
g
i
t-ls-files
.
txt: clarify w
h
at "o
t
h
er files" mean for
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
rebase: consistent e
r
ror messages f
o
r s
t
aged and uns
t
a
ged
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-08-05
Matt
h
ieu
Moy
Better
u
sage strin
g
f
o
r reflo
g
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu Moy
clone: add test for p
u
sh on
an empty c
l
o
ne
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
Up
d
at
e
g
i
t
-add
.
t
xt
a
c
cording to the new po
s
sibilit
i
es
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-19
M
atthieu Moy
g
it add -p:
n
ew "
q
uit" command at the
prompt
.
commit
|
commitdiff
|
tree
2009-04-16
M
atthieu M
o
y
Update
g
it-add
.
txt a
c
co
r
ding
to
t
h
e
n
e
w possi
b
ilities
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-16
M
a
t
thieu Moy
g
i
t add -p: new
"
q
u
i
t"
command
at
t
he prompt
.
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Moy
git-pu
l
l
.
sh: better warning mes
s
age for "git
pull"
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-08
Matthi
e
u Moy
git-rev-list
.
t
x
t
:
make ascii mar
k
up unif
o
rm
w
ith
o
ther
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu M
o
y
g
it-send-email
.
t
xt: clarify whi
c
h option
s
ta
k
e
an argument
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-checkout
.
txt
:
clarify that <branch> a
p
pl
i
es when
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
i
t
-checkout
.
txt: fix inc
o
r
rect stateme
n
t about
HEAD
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-02-20
Matt
h
ieu Moy
M
ore friendl
y
mes
s
age when locking
the index fail
s
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-02-20
Matthie
u
Moy
D
oc
u
ment git
blame --revers
e
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
builtin-mv
.
c:
c
heck for unversionned
f
iles b
e
fore looking
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-02-04
Mat
t
hie
u
M
oy
Add a
t
estcase
f
or "g
i
t mv -f" on untrac
k
ed fi
l
es
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2009-02-04
M
a
tthieu Moy
M
issin
g
&&
in t/t7001
.
sh
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2008-04-30
M
a
tthieu Moy
git-s
v
n
: detect and fail gracefully
when dco
m
mitting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthi
e
u Moy
Doc
u
ment that WebDAV doesn't need git on
the server
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2008-03-03
Matt
h
ieu Moy
F
ix
i
n
correc
t
wording in git
-
merge
.
txt
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2007-11-20
Matthieu Moy
Doc fix for
g
it-refl
o
g: mention @{
.
.
.
} syntax,
a
n
d
.
.
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2007-08-19
Matthieu Moy
Add and document a
g
lo
b
a
l
--no-p
a
ger
o
p
tion fo
r
g
i
t
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2007-07-14
Matth
i
eu Moy
Mo
r
e permi
s
s
ive "git-rm --cac
h
ed
"
be
h
avior
wi
t
hout -f
.
Signed-off-by: Matthieu Moy <
Matthieu.Moy@imag.fr
>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Mo
y
Added a reference to git
-
a
d
d in
t
he documenta
t
ion f
o
r
.
.
.
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