repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/maint-hint-failed-merge' into maint
2009-11-23
Matthieu Moy
user-manual: Do
c
u
ment that "git me
r
ge" d
o
esn't like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu M
o
y
merge-rec
u
rsive: point the user t
o
commit when fil
e
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
M
a
tthi
e
u M
o
y
expand_
u
ser_path: ex
p
and
~ to $HOME, n
o
t to
t
he actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matt
h
ieu Moy
Expand ~ and ~user in co
r
e
.
excludesfile, commit
.
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
Matthieu
M
oy
pu
s
h: Co
r
rectly initi
a
lize nonfast
f
o
rward in tra
n
sport_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 m
a
in usage string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Ma
t
thieu Moy
s
ta
s
h: simplify
d
efaulting to "save"
a
nd reject unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
rese
t
: make the reminder ou
t
p
ut
consistent with "ch
e
c
kout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
Rename
R
EFRE
S
H_SAY_CHANGED to
R
E
F
RESH_
I
N_PORCELAIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu
Moy
filter
-
branch:
make the u
s
age
s
tring fit on
8
0
chars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Matthieu Moy
push: poin
t
t
o 'git p
u
l
l' and 'g
i
t
push --force' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Mat
t
hieu Moy
Show us
a
ge st
r
ing
for '
g
it log
-
h', 'git sh
o
w -h' and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matth
i
eu Moy
git-ls
-
f
iles
.
txt: cla
r
if
y
what "other fil
e
s"
m
ea
n
for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matt
h
i
e
u
Moy
rebase:
c
onsi
s
te
n
t error
messages
for staged and unstaged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
M
a
tthieu Moy
Better usage string for ref
l
og
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matt
h
i
e
u Moy
clone: a
d
d
test for
push on an empty clone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
Update g
i
t-add
.
txt according to the new
p
ossibilities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthie
u
Moy
g
it
add -p: new "quit" command at the prompt
.
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
Updat
e
git-add
.
t
x
t accor
d
ing t
o
t
h
e new possibilities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
M
a
t
thieu M
o
y
git add -p: new "quit" comma
n
d at t
h
e prompt
.
commit
|
commitdiff
|
tree
2009-04-08
M
a
tt
h
i
e
u
M
oy
git
-
pull
.
sh: bett
e
r warning message for
"
git pul
l
"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-list
.
txt:
make ascii markup
u
n
i
f
o
rm with o
t
her
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
Moy
gi
t
-send-email
.
txt: clarify whic
h
o
ptions take an argument
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
i
t
-checkout
.
txt: clari
f
y that <branch> ap
p
lies when
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
M
oy
git-
c
heckout
.
txt:
f
i
x incorrect
state
m
ent about HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
More friendly mes
s
age
when locki
n
g the index f
a
ils
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Mat
t
h
ieu Moy
Docu
m
ent g
i
t
b
lame --reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
builtin-mv
.
c
:
c
h
e
ck for unvers
i
onned files befor
e
l
o
o
k
ing
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
Add a test
c
ase for
"
git mv -f"
o
n
untracked files
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthi
e
u Mo
y
Missing && in t/
t
7
00
1
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Ma
t
thieu Moy
g
it-svn: det
e
ct and fail gr
a
c
e
fully when
dcommitting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthieu
M
oy
D
ocument that WebDAV doesn't need
g
it on the server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matt
h
ieu Moy
Fix incorrect wordin
g
in git-merge
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
Matthi
e
u Moy
Doc fix fo
r
git-r
e
flog: ment
i
o
n
@{
.
.
.
} sy
n
t
a
x, a
n
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
M
atthieu Moy
Add an
d
d
ocume
n
t a gl
o
bal
--no-pager opti
o
n
f
or git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matt
h
ieu Moy
M
o
re p
e
rmis
s
i
v
e
"gi
t
-
rm --ca
c
hed" b
e
havior w
i
thout -f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu M
o
y
Added a reference to git-add in the doc
u
m
e
n
ta
t
ion for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Ma
t
th
i
eu Mo
y
Document git add -u introduced e
a
rlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree