repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5
2009-12-31
Matthieu Moy
branch: die
e
x
p
l
i
c
itly why when
c
a
lling "git
branch
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu
M
oy
builtin-merge: show user-fr
i
endly er
r
or messages for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
m
e
rge-r
e
cu
r
s
i
ve: make the
error-me
s
sa
g
e generation
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
user
-
manual: Document
that "git merge
"
doesn't like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tthieu Mo
y
merge-recursive: poi
n
t the user
t
o commit
w
h
en file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu
Moy
ex
p
and_user_path: expand ~ t
o
$HOME, not
t
o the actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Moy
Expand ~ an
d
~user
in core
.
excludesfile, commit
.
tem
p
late
...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
p
u
sh: C
o
rrectly
i
nit
i
aliz
e
nonfastf
o
rward
in transpo
r
t_pu
s
h
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthieu Moy
wrap g
i
t
'
s main usage s
t
ring
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Matthieu
Moy
stash: simplify defaulting to "save" and reject
u
nk
n
ow
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
M
a
t
thie
u
Moy
reset
:
make the r
e
mind
e
r output consis
t
e
nt with
"chec
k
out"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
Re
n
ame REFRESH_
S
AY
_
CHANGED to
REFRESH_IN_PORCELAIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu
Moy
filter-
b
ranch: ma
k
e t
h
e usage strin
g
fi
t
on 80 c
h
ars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Matthieu Moy
pu
s
h: point to
'
g
it pull' and 'git pu
s
h --
f
orce
'
in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matthieu Moy
Show u
s
a
ge s
t
rin
g
for '
g
it log -h', 'git s
h
ow -h'
a
n
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthi
e
u
M
oy
git-ls-fil
e
s
.
tx
t
: cl
a
ri
f
y what "other files" mean
f
o
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
rebase: consistent error messages for stage
d
and unstaged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Mat
t
h
i
eu Moy
Bet
t
er
usag
e
string for reflog
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu Moy
clon
e
: add
test for push o
n
an e
m
p
ty clone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthi
e
u Moy
Update g
i
t-ad
d
.
t
x
t
according to
the new po
s
sibilities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
M
a
tt
h
ieu
Moy
g
i
t
add -p: new "q
u
it
"
co
m
m
a
nd
at the pr
o
mpt
.
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
Update git-add
.
txt acco
r
ding t
o
the new possibilities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
M
a
tthieu
M
oy
git add
-p: n
e
w "quit" com
m
and at the promp
t
.
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Mo
y
git-pull
.
s
h
:
better warning mes
s
ag
e
for "git pull
"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Mo
y
git-rev-li
s
t
.
txt: make asc
i
i markup uni
f
orm with o
t
h
e
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu Moy
g
i
t-send-email
.
txt: cl
a
rify
w
hich
o
p
tions take an argument
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-che
c
kout
.
txt:
c
lari
f
y t
h
at
<
branch> applies when
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-checkout
.
txt: f
i
x in
c
orre
c
t sta
t
em
e
nt ab
o
ut HE
A
D
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matt
h
ieu Moy
M
o
r
e friendly message when loc
k
ing the inde
x
fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matt
h
ieu
M
oy
Document
g
it blame --reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
builtin-m
v
.
c:
c
he
c
k f
o
r
u
nversio
n
ned fil
e
s be
f
ore lookin
g
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthie
u
Moy
Add
a
testcase for
"
git mv -f" on untracked fil
e
s
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
Missing &
&
in
t/t
7
001
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
M
a
t
thie
u
Moy
git-svn:
d
e
t
e
c
t and fail gracefully when dcommittin
g
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matt
h
ieu
M
oy
Document that WebDAV does
n
't need git
o
n the server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu M
o
y
Fix incorrect wo
r
ding in gi
t
-merg
e
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
Matthieu
M
o
y
Doc f
i
x for git-re
f
log: me
n
tion @{
.
.
.
} syntax, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matthie
u
Moy
A
dd and document a global -
-
no-pager optio
n
f
o
r
git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matthieu Moy
More
permissi
v
e
"git-rm -
-
cached" behav
i
or without
-
f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matt
h
ieu Moy
Added a reference
t
o git
-
add i
n
the docu
m
en
t
a
tion for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
Doc
u
m
e
nt git add -u introdu
c
ed earl
i
er
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree