repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git notes merge: Handle real, non-conflicting notes merges
2010-08-09
Matthieu Moy
Document -B<n>
[
/
<
m
>
], -M<n> and -C<n> variants of
.
.
.
Original patch by
Matthieu Moy
, but documentation for -B mostly...
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-08-05
M
a
tthieu Moy
pretty-o
p
ti
o
ns
.
txt
:
match --fo
r
mat's documentation
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-07-28
M
a
tthieu Moy
Docume
n
t ls-files -t a
s
semi-obsolete
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu Mo
y
Clar
i
fy help message wh
e
n no
remote is spec
i
fied
i
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-03-07
Matt
h
ieu Moy
stash: su
g
gest th
e
co
r
rect command l
i
ne
f
o
r
unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
U
se git_mkst
e
mp_
m
ode instead of
pla
i
n mkstemp to
c
rea
t
e
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
gi
t
_mkst
e
mps_m
o
d
e: don't set e
r
rno to EINV
A
L on exit
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
M
a
tthieu Moy
Use git_mkstemp_m
o
de a
n
d xmkstemp_
m
od
e
i
n
odb
_
mkstem
p
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Mo
y
git_
m
ks
t
emp_mode, xm
k
s
t
emp_mode:
v
ariants o
f
g
i
tmkst
e
m
p
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matth
i
eu Mo
y
M
ove g
i
tmkstemps to
p
ath
.
c
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
Add
a
t
es
t
case for ACL
w
ith restrictive umask
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-19
Matthieu M
o
y
b
ranch: warn and refuse t
o
set a branch as a tr
a
cking
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matthie
u
Moy
loc
k
file: show absolute f
i
len
a
me in unable_to
_
loc
k
_messa
g
e
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matth
i
e
u
M
oy
Be
more user-friend
l
y whe
n
refu
s
in
g
to do
s
omething
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matt
h
i
eu Moy
push: spell 'Note about fast-forwar
d
s' section name
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-02
Mat
t
hieu Moy
stash: mention -
-
patch in us
a
ge s
t
ring
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
Ma
t
thieu Moy
branch: die explicitly wh
y
when c
a
lling "git branch
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
M
atthieu Moy
Submitting
P
atch
e
s: hi
n
ts to know the s
t
a
t
us of a submitted
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
Mat
t
h
i
eu M
o
y
bui
l
ti
n
-
config: add --pat
h
op
t
i
o
n
d
o
i
ng
~
and ~us
e
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-07
Matthieu Mo
y
Detaile
d
diagnosis when p
a
rsing an
o
bject
name fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matth
i
eu
M
oy
builtin-merge: show user-fri
e
ndly error messages for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu Moy
merge-r
e
cursive: make the
error-
m
essage generati
o
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu M
o
y
use
r
-manual: Document that
"
g
it merge
"
do
e
sn't like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
me
r
ge
-
recu
r
siv
e
: point
t
he user to commit
w
hen file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthieu Moy
expand_user_path: e
x
pand
~
to
$HOME
,
not
to the actua
l
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
M
a
tthi
e
u Moy
Expand ~ and ~user
in
c
ore
.
excludesfi
l
e, commit
.
tem
p
lat
e
...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 Moy
push:
Correctly ini
t
i
a
lize nonf
a
stf
o
rward in
t
r
ansport_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthieu Mo
y
w
ra
p
g
i
t
's
m
a
in u
s
age string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Matthi
e
u
Moy
stas
h
: simpli
f
y defaulti
n
g
to "save" and reject unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
M
att
h
i
eu Moy
rese
t
: make the reminder o
u
tput co
n
si
s
tent wit
h
"checkout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
Ren
a
me
REF
R
ESH_S
A
Y_CHANGED
t
o REFRESH_IN_PORCEL
A
IN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
M
at
t
h
i
eu Moy
filt
e
r
-
branch: make the usage string fit on 80 cha
r
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
M
a
tthieu Moy
push: point to 'git pu
l
l' and 'git
p
ush --force' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Ma
t
t
h
ieu Moy
Show usa
g
e string for '
g
i
t
log -h', 'git show -h' an
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
git-ls-
f
i
l
e
s
.
txt: clarify what
"other files" mean for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Moy
re
b
a
s
e
:
c
onsistent error messages for staged and u
n
sta
g
ed
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthieu Mo
y
Bette
r
usage
s
tring for refl
o
g
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu
M
oy
clone:
add t
e
st for p
u
sh on
an empty clone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matth
i
e
u Moy
Update git-a
d
d
.
txt a
c
c
ording to the
new poss
i
biliti
e
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Ma
t
th
i
eu Moy
git add
-p: new "qui
t
"
c
ommand a
t
the pro
m
p
t
.
commit
|
commitdiff
|
tree
2009-04-16
Matthi
e
u
Moy
Update git-add
.
txt acc
o
rdin
g
to the new possib
i
litie
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
Matthi
e
u
M
o
y
git add
-
p: new "quit" command at the prompt
.
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Moy
git-pu
l
l
.
sh: bet
t
er warning m
e
ssage for "git pull
"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Mo
y
git-r
e
v-l
i
st
.
txt: make ascii markup
uni
f
or
m
with other
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
gi
t
-se
n
d-email
.
txt:
clarify
w
hich opt
i
o
n
s take an argume
n
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
M
oy
git-c
h
eckout
.
txt: clarify th
a
t <branch> applies whe
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thieu Moy
git-chec
k
out
.
txt:
f
ix in
c
orrect
s
tatement about HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matth
i
e
u Mo
y
More
f
riendly message when lock
i
ng
the
i
n
dex fail
s
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Ma
t
thieu
Moy
Document
g
it blame -
-
reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
builtin-mv
.
c
:
check for unversion
n
ed f
i
les before l
o
okin
g
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matt
h
ieu Moy
Add
a
t
estcase for
"git mv -f" on
untracked
fi
l
es
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
Missing &
&
in
t
/t7001
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Ma
t
thieu
M
o
y
g
it-svn:
detect
a
nd fail gracefully
w
h
e
n dcommitti
n
g
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthie
u
Moy
Document t
h
at
WebD
A
V doesn't
n
ee
d
git on the serve
r
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Ma
t
thieu
M
oy
Fix
i
ncorrect wording in git-merg
e
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
Matth
i
eu Moy
Doc fix for git-refl
o
g: ment
i
on
@{
.
.
.
} s
y
ntax, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matthieu
Moy
Add and
do
c
ument a global --no-pager option
f
or git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matt
h
ie
u
Moy
M
ore permissive
"
g
i
t-rm --ca
c
hed"
b
e
h
avio
r
without -f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Ma
t
thieu Moy
Add
e
d
a
reference to git-add in the doc
u
mentation for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
M
a
t
thieu Moy
Document git
a
dd -u introdu
c
ed earlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree