repo.or.cz
/
git
/
gitweb.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
explici
t
l
y why whe
n
calling
"git branch
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thieu Moy
builtin
-
merge: s
h
ow user-friendly
e
rror messages for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matt
h
ieu Mo
y
m
erge
-
r
ec
u
rsive:
m
ake the error-message generation
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
M
a
tthieu Moy
user-manual: Document that "g
i
t
m
erge" doe
s
n't l
i
ke
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
merge-recursiv
e
: point the user
t
o commit
when file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu
M
oy
expand_us
e
r_p
a
th: expand ~
to $HOME, not to the actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
M
a
tth
i
eu Moy
E
x
pand ~
and ~user in core
.
e
x
cludesf
i
l
e
,
com
m
it
.
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
: Corr
e
ctly initialize
nonfastf
o
rward in transport_p
u
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthieu Moy
wrap git's main usage string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
M
atthieu M
o
y
s
t
ash
:
s
implify defa
u
lting to "save
"
and r
e
ject
un
k
n
o
wn
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
reset: make the reminde
r
o
utpu
t
consistent with
"checkout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
M
atthieu Moy
R
e
name REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu Moy
filt
e
r-branch: make th
e
usage string fit on 80 chars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Matthieu Moy
push: point to
'
git pull' and 'git push
-
-
force' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matthie
u
Moy
Show
usa
g
e string for
'g
i
t log -h', 'git show -h'
a
nd
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matt
h
ieu Moy
g
i
t
-l
s
-
files
.
t
xt: clarify what "other f
i
les" mean for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthi
e
u Moy
rebase: con
s
istent e
r
ror messages
f
or
s
taged and un
s
taged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthie
u
M
oy
Better
u
sage
s
t
ring for reflog
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu
M
oy
clone: add test for pu
s
h on an
empty clone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu
M
o
y
Update git-add
.
t
xt according to
t
he
new possibi
l
iti
e
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
git add -p: new "qu
i
t" command at th
e
promp
t
.
commit
|
commitdiff
|
tree
2009-04-16
M
atth
i
e
u
Moy
Update git
-
a
dd
.
tx
t
according t
o
the n
e
w possibilities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
M
a
t
th
i
e
u Moy
g
i
t add -
p
:
new "quit"
c
ommand at
t
he p
r
ompt
.
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
h
ieu Mo
y
git-pull
.
sh: bett
e
r warn
i
ng me
s
sage for
"
g
it pull"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthi
e
u M
o
y
git-r
e
v-list
.
txt: m
a
ke ascii mark
u
p uniform with other
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-send-email
.
txt: clarify w
h
i
ch op
t
i
o
n
s
t
a
ke an
a
r
g
u
m
ent
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matt
h
ieu M
o
y
gi
t
-chec
k
out
.
txt: cla
r
ify t
h
a
t
<
branch> applies w
h
e
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hieu Moy
git-checkou
t
.
txt
:
fix in
c
or
r
e
ct
stateme
n
t a
b
o
u
t HEA
D
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
M
o
r
e friendly messag
e
when lo
c
king the index fai
l
s
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
Document git blame
-
-reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu
Moy
builti
n
-mv
.
c: che
c
k for
u
nve
r
sionned files before lookin
g
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
Ad
d
a te
s
tcase
f
or "git mv
-
f
"
o
n u
n
t
r
acked
fil
e
s
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
Missing &&
in t
/
t7
0
0
1
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Mat
t
hi
e
u Moy
git-sv
n
: detect a
n
d
fail gracefully when dcommitting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthi
e
u Moy
Document that WebDAV doesn't need
g
it on
t
he server
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
M
atthieu Moy
Fix incorr
e
ct wording in git-merge
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
M
atthieu
M
oy
Do
c
fix for git
-
r
e
flog:
m
e
ntion @{
.
.
.
} synta
x
, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matthi
e
u Moy
Add and docume
n
t
a
gl
o
bal --no-pager o
p
t
ion for
g
it
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matt
h
i
eu Moy
More permissiv
e
"
git-rm --cached" behavior w
i
thout
-
f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Ma
t
thieu Moy
Added a reference to
g
it-add in the documentati
o
n for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matth
i
eu Moy
D
ocument g
i
t add -u introduced earli
e
r
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree