repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint' to sync with 1.6.5.7
2009-11-30
Matth
i
eu Moy
builtin-merg
e
: show user-
f
riendly error m
e
ssages
for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
m
e
rge-recursive: make t
h
e error-
m
essage genera
t
ion
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
user-manual: Docume
n
t that
"
git merge" does
n
't like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Mat
t
h
ieu Moy
me
r
ge-recur
s
ive
:
point the user to commit whe
n
file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Ma
t
thieu Moy
expand_user_path:
expand ~
to $HOME,
n
ot to
the
a
c
t
ual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
M
atthie
u
M
o
y
Expand ~ and ~user in core
.
ex
c
ludesfile, 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
Matthieu Moy
pu
s
h
:
C
orrec
t
ly initialize non
f
astforwa
r
d i
n
t
r
a
n
sp
o
rt_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthieu M
o
y
w
r
a
p git'
s
main usage string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Mat
t
hie
u
M
o
y
sta
s
h
:
s
i
mplif
y
de
f
aulti
n
g to "save" an
d
reject unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Mat
t
hie
u
Moy
reset:
make
t
he
r
e
m
i
nd
e
r
o
utp
u
t consistent with
"
check
o
ut"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
Rename REFRESH
_
SA
Y
_CHANGE
D
to RE
F
RESH
_
IN_PORCELAIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu Moy
filter-branc
h
: make t
h
e
usage string
fit on 80
c
h
a
rs
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Mat
t
hieu Moy
pus
h
: po
i
nt to 'git pull' and '
g
it push --f
o
rce' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matthie
u
M
o
y
Show
u
s
age s
t
ring for 'git
l
og -h',
'
git show -h' and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
M
atthieu Moy
git
-
ls-files
.
txt: cl
a
rify what "o
t
her files" m
e
an for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
M
atthie
u
Moy
rebase: consistent
e
r
ror messa
g
es
for st
a
g
ed and u
n
staged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthieu Mo
y
Be
t
t
e
r
usag
e
string
for reflog
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu Moy
clone: add test for
p
u
s
h o
n
an empty
c
lone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matth
i
eu Moy
Update git-ad
d
.
txt ac
c
ording to th
e
new p
o
ssibi
l
i
ties
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
git add -p: new "quit" c
o
mm
a
nd at the prompt
.
commit
|
commitdiff
|
tree
2009-04-16
Matthieu
Moy
Up
d
ate git-add
.
txt ac
c
ording to the
new pos
s
ibilitie
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
M
a
tthie
u
Moy
git
a
dd
-p: new "
q
uit
"
c
o
mman
d
at the prompt
.
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthi
e
u Moy
git-p
u
ll
.
sh: better
w
ar
n
ing mess
a
ge
f
or
"
git pull"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-rev-list
.
tx
t
: make as
c
ii ma
r
kup u
n
iform with
other
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-
send-email
.
tx
t
: clarify which options
take an argume
n
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
M
oy
g
i
t-checkout
.
t
xt: clar
i
f
y
that <branch>
applies
w
hen
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Moy
git
-
check
o
ut
.
t
xt: fix incorrec
t
statem
e
nt about HE
A
D
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Mat
t
hieu Moy
More friendly
m
es
s
age when
l
ockin
g
the in
d
ex fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
D
ocument git
b
lame
-
-reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
M
a
t
t
hi
e
u Moy
builtin-mv
.
c
:
check for unvers
i
onned fi
l
es befo
r
e
looking
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthie
u
M
o
y
Add a testcase for "git mv
-f" on untrack
e
d
files
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Mo
y
Missing && in t/
t
7
0
0
1
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Matth
i
e
u
M
o
y
git-svn:
detect and fail
gra
c
eful
l
y when dcomm
i
tting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
M
a
tthieu Moy
Docume
n
t that WebDAV doesn't need git on th
e
server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu M
o
y
Fi
x
in
c
o
rrect wordin
g
in
g
it
-
merg
e
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
Matthieu
M
oy
Doc fi
x
for git-reflog
:
mention @{
.
.
.
} syntax, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matth
i
eu Moy
Add and document a global --no-p
a
ger option for git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matt
h
ieu
Moy
More per
m
i
ssive "git-rm -
-
cached"
beha
v
io
r
without -f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Ma
t
thieu Moy
Added a r
e
ferenc
e
to g
i
t-add i
n
the d
o
cument
a
tio
n
for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
Document git add -u
introduce
d
earl
i
er
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree