repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ap/maint-merge-strategy-list-fix'
2009-11-23
Matthieu Moy
use
r
-manu
a
l: Document
t
hat "
g
i
t
m
erge" doesn
'
t
like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthi
e
u Moy
merge-recursive: point
the user to com
m
it when fil
e
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
expand_user_path: expand ~ to $HOME
,
no
t
to the actu
a
l
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Moy
E
xpand ~ and ~user in core
.
excl
u
desfi
l
e, commi
t
.
temp
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
M
a
t
thieu Moy
p
ush: Correctly init
i
alize
nonfast
f
orwar
d
in trans
p
ort_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matt
h
ie
u
Mo
y
wrap git's
main usage string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Mat
t
hieu Mo
y
stash
:
simplify
d
efaulting
to "save
"
and reje
c
t unkn
o
wn
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Mo
y
res
e
t: make the
reminder outp
u
t consistent with "ch
e
ckout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthi
e
u
Moy
Ren
a
me REF
R
E
S
H_SAY_CHANGED t
o
REF
R
ES
H
_IN_PORC
E
LAIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
M
a
tthieu Moy
filter-branch: make the usa
g
e string fit on 80 c
h
ars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
M
a
t
t
hieu Moy
push: po
i
nt
t
o
'git pul
l
' and 'git push -
-
force' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matthieu Moy
Show
u
sage str
i
ng for '
g
it log
-
h', 'git show -h' and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthie
u
Moy
git-ls-files
.
txt: clar
i
f
y
what "oth
e
r files" me
a
n
f
or
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
rebase: c
o
nsistent
e
rr
o
r messages for staged and unstaged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Ma
t
thieu Mo
y
Better
u
sage string for r
e
flog
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Mat
t
hieu
M
oy
c
l
one: add tes
t
for push on an emp
t
y clo
n
e
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
M
a
tthieu Moy
Update git-add
.
txt accordin
g
to the new possibilit
i
es
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
g
it add -p: new "q
u
it" c
o
mma
n
d at the prompt
.
commit
|
commitdiff
|
tree
2009-04-16
M
a
tthieu Moy
Update
git-ad
d
.
t
xt acco
r
ding to
t
h
e new possibilit
i
es
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
git add -p: new "qui
t
" command at the prompt
.
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-pull
.
s
h
:
b
etter warning m
e
s
s
a
g
e
f
o
r
"
git pull"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matt
h
ieu Moy
g
it-re
v
-
l
ist
.
txt: m
a
ke ascii markup uniform with ot
h
er
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hieu M
o
y
git-send-email
.
txt: c
l
arify
w
hi
c
h optio
n
s
take an argume
n
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-checkout
.
txt: clarify th
a
t <branch> applies when
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matt
h
ieu
Moy
g
i
t-che
c
k
o
ut
.
txt:
f
i
x incorrect
stat
e
m
e
nt about HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
M
a
t
t
hieu Moy
Mor
e
fr
i
endly
m
essage wh
e
n locking the
index
f
ails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matt
h
i
e
u Moy
D
o
cu
m
ent
git blam
e
--reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
builtin-
m
v
.
c: check for unversionned files b
e
fore looking
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Mo
y
A
dd a testcase f
o
r "git mv
-
f
" on
u
ntracke
d
f
i
les
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matt
h
ieu M
o
y
Missing
&
&
i
n t/t7001
.
s
h
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Matthieu Moy
git-svn: dete
c
t and fail gr
a
cefully when dcommittin
g
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthieu Moy
D
o
c
ume
n
t that WebDAV d
o
esn't need git on the server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matth
i
eu Moy
Fi
x
i
ncorr
e
c
t
wording i
n
git-merge
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
M
a
tthi
e
u
M
oy
Doc fix f
o
r git-refl
o
g: m
e
ntion @{
.
.
.
}
s
yntax
,
a
n
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matt
h
ieu
M
oy
A
d
d an
d
document a global -
-
no-pager option for git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matthieu
M
o
y
M
o
re
p
e
rmissive "gi
t
-rm --cach
e
d" behavior withou
t
-f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Mo
y
Add
e
d
a r
e
ference to git-add in the
docu
m
entation for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Mo
y
Document git add -u introduced
earlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree