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
Matthieu Moy
builtin-me
r
ge: s
h
ow use
r
-friendly error mess
a
ges for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merg
e
-recursive: make
the e
r
ror
-
messa
g
e gene
r
ation
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tthieu Moy
user-manua
l
: Document
that "git merg
e
"
d
oesn't like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
merg
e
-
recu
r
siv
e
:
p
o
in
t
the
user
t
o com
m
it when file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthi
e
u
Moy
expand_user_path: expand
~
to $HOME,
not
to the actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matthi
e
u Moy
Expand
~
and
~
user i
n
c
o
re
.
excludesfile, c
o
mmit
.
t
e
mplate
...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
Matthi
e
u Mo
y
push: Correctly initia
l
i
ze nonfastforward in tra
n
sport_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthieu Moy
wrap
git's main usage
s
t
ring
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
M
att
h
ieu M
o
y
stash: sim
p
lify
de
f
ault
i
ng to "save
"
and reje
c
t unk
n
own
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
reset: mak
e
the reminder o
u
tput consis
t
e
nt with "che
c
kout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
M
a
tthieu Mo
y
R
e
name REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAI
N
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Ma
t
thieu Mo
y
f
i
l
ter-branch:
make the usag
e
s
t
r
ing
fit on 80 chars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Matthie
u
Moy
p
ush: po
i
nt to 'git
pul
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
Mo
y
Sh
o
w usage string for
'
git log
-
h', 'gi
t
show -h' and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
g
it-ls-fil
e
s
.
txt: clarify what "ot
h
er files" mean for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu
M
oy
r
e
base: consist
e
n
t
err
o
r messages f
o
r staged and unstaged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthieu Moy
Better u
s
ag
e
string for
r
efl
o
g
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
M
a
tthieu Moy
clone: a
d
d
test for push on an
empty clon
e
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
Up
d
ate git
-
a
d
d
.
txt acco
r
ding to the new possibilit
i
es
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthie
u
Moy
git a
d
d -p: new
"quit" command at the prompt
.
commit
|
commitdiff
|
tree
2009-04-16
M
a
tthieu Moy
Update gi
t
-add
.
txt according to
the new possib
i
lities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
Matthieu
Moy
g
it add
-
p: n
e
w
"q
u
it" command a
t
the
p
rompt
.
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-p
u
ll
.
sh: better warning
m
e
ssage for "git pull
"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu M
o
y
g
it-rev-list
.
txt: make ascii markup u
n
iform with o
t
her
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hieu
M
oy
git-send-em
a
il
.
t
xt: c
l
ari
f
y
which options take an argume
n
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Mo
y
git-ch
e
ckout
.
tx
t
: clarify
t
hat <branch
>
a
p
p
lies
when
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-
c
heckout
.
txt: fix incorrect statement about
HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Mat
t
hie
u
Moy
More frie
n
d
ly message when locking t
h
e
index fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matt
h
i
e
u Mo
y
Document git
blame --reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Ma
t
thieu
Moy
bu
i
lti
n
-mv
.
c: check for unversion
n
ed f
i
les before lookin
g
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matt
h
ieu Moy
Add a testcas
e
for "git mv
-
f" on
untracked fil
e
s
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
M
a
tthieu Moy
Missing && in t/t7001
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
M
a
tt
h
ie
u
Moy
git-svn
:
detec
t
and fail
g
r
acefu
l
l
y when dcommitting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthieu M
o
y
Docume
n
t that Web
D
AV does
n
't need gi
t
on t
h
e server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu
M
o
y
Fix
i
n
correct wording i
n
git-merge
.
t
xt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
M
atth
i
eu Moy
Doc fix f
o
r
g
i
t-reflog: mention
@
{
.
.
.
}
s
yn
t
ax
,
a
n
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matth
i
eu Moy
Add an
d
d
o
c
u
ment a
g
lobal -
-
no-pager optio
n
for g
i
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
M
atthieu Moy
More permissive "git-r
m
--cach
e
d
"
behavior without -
f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthi
e
u Moy
Added a ref
e
r
e
nce
to git-add in the document
a
tion for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Ma
t
thieu Moy
Docum
e
nt git add -u introduced earlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree