repo.or.cz
/
git.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> varian
t
s 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
atthieu Moy
pretty-opti
o
ns
.
txt: match --format's
doc
u
m
e
nta
t
ion
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-07-28
Ma
t
thieu
M
o
y
Document ls-fil
e
s
-t as semi-obsolete
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-07-27
Mat
t
hi
e
u M
o
y
C
larify
h
e
lp m
e
ssage when no remote
i
s specified in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-03-07
M
a
tthieu M
o
y
stash: suggest the
corr
e
ct command line f
o
r unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu
Moy
Use git_mk
s
temp_mode i
n
stead of plain mkstem
p
to create
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthie
u
Moy
g
it_mkstemp
s
_mode: don't set errno
t
o EINVAL on exit
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
Use git_mks
t
emp_mode and xmkst
e
mp_mo
d
e
in odb
_
mks
t
emp
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Mat
t
hieu M
o
y
git_mkstemp_mode, xmkstemp_mode
:
variants
of
g
i
t
mkste
m
ps
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu M
o
y
Move
g
itmkste
m
p
s
t
o path
.
c
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
Add a testcase for ACL
w
ith restric
t
iv
e
umask
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-19
Matthieu Mo
y
branch: warn and refuse
t
o
s
et a branch as
a tracki
n
g
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matthieu Moy
l
o
c
kfi
l
e
:
s
how absolu
t
e filename
in unabl
e
_
t
o_lock_messa
g
e
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matthieu Moy
Be more user-friendly wh
e
n
r
efusing to d
o
s
o
meth
i
n
g
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matt
h
ieu Moy
p
ush
:
spell 'Note about fast-forwards' secti
o
n
n
a
me
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-02
Matthi
e
u 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
b
ran
c
h: die explicitly why w
h
en cal
l
ing "git branch
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
M
a
tthieu Mo
y
Submittin
g
Patches: hints
t
o
k
n
o
w the
status of a submitted
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
M
atthieu M
o
y
bui
l
tin-confi
g
:
a
d
d -
-
path option doing ~ and ~user
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-07
Matt
h
ie
u
Moy
Detailed d
i
agnosis when pars
i
ng a
n
object name fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
M
a
tt
h
ieu
M
o
y
bui
l
ti
n
-m
e
rge: show use
r
-friendly erro
r
messages for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Ma
t
thieu Moy
merge-recursive: make t
h
e
error
-
mes
s
age generati
o
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthi
e
u
Mo
y
user-man
u
al: D
o
cument
tha
t
"git merge
"
doesn't like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matt
h
ieu M
o
y
m
e
r
ge-recursive: point the u
s
er to commit when file
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Ma
t
t
h
i
eu Moy
expand_use
r
_path: expand ~ to $HO
M
E
,
not
t
o
t
he
actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matthi
e
u M
o
y
E
x
p
an
d
~ and ~use
r
in core
.
excludesfile, c
o
mmit
.
t
emplate
...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
M
a
tthieu Moy
push:
Correctl
y
i
n
itiali
z
e nonfas
t
forward in transport
_
push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthi
e
u Moy
wrap
git
'
s main usage string
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Matthieu Moy
s
tash: simplify defaulting to "save" and reject
unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthie
u
M
o
y
r
e
set
:
mak
e
the
remi
n
d
e
r output consis
t
ent wi
t
h
"checkout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu
M
o
y
Rename REFRESH_SAY_CHANGED
t
o REFRESH_IN_PORCEL
A
IN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthi
e
u
M
o
y
filter
-
branc
h
: make the usage string
fit on 80 ch
a
rs
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Matth
i
eu
Moy
pu
s
h
: point to 'git pu
l
l' and 'git push --fo
r
ce'
i
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matth
i
eu Moy
Sh
o
w
usage string for 'git log
-h', 'git show -h' and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthie
u
Moy
git-ls-files
.
txt: cla
r
ify what
"other fil
e
s" mean for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu Mo
y
rebase:
c
onsistent error
me
s
s
a
ges for staged a
n
d un
s
taged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthieu Mo
y
B
etter u
s
ag
e
string for ref
l
og
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu
M
oy
clon
e
: add te
s
t
for push on an
empty clone
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthie
u
M
oy
Update git
-
add
.
txt accordin
g
t
o
th
e
new
p
ossibiliti
e
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu Moy
git ad
d
-p: new "quit"
command at
the prompt
.
commit
|
commitdiff
|
tree
2009-04-16
Matthieu
M
o
y
Update git-ad
d
.
txt a
c
cording t
o
the
new possibilities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
M
a
tt
h
ieu Moy
git a
d
d -p: new "
q
uit" comm
a
nd
at t
h
e prompt
.
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
thie
u
Moy
git
-
pull
.
s
h
: bet
t
er warning message
f
o
r "git
p
ull"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthi
e
u
Mo
y
g
it-rev-list
.
txt: m
a
ke ascii
m
arkup u
n
iform
w
ith other
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
M
a
tthieu Mo
y
g
it-send-ema
i
l
.
txt: clarify
w
hich op
t
i
on
s
take an argument
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthie
u
Moy
g
i
t-checkout
.
txt: clar
i
fy that <branch>
a
pplies w
h
en
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-che
c
kout
.
txt:
f
i
x incorre
c
t stateme
n
t a
b
out HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
More friendly m
e
ss
a
ge when loc
k
in
g
the
index fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Mat
t
hi
e
u Moy
Document git blame --reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
builti
n
-
m
v
.
c
: check
f
or unver
s
ionned files
b
efo
r
e looking
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthi
e
u Moy
A
dd a te
s
tcase for "git mv -f"
on
untracked files
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matth
i
eu Moy
Missing &&
i
n t/t7001
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Ma
t
thie
u
Moy
git-svn: detect
a
n
d fail gr
a
cefully when dcommitt
i
ng
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthieu Moy
Do
c
ument that
WebDAV d
o
e
sn't need git on t
h
e
s
erver
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu Moy
Fix in
c
orrect wordi
n
g in git-merge
.
t
xt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
Matthieu Moy
Doc f
i
x for git-
r
eflog: mention @{
.
.
.
} syntax, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
Matthieu Moy
Add
and document a gl
o
bal -
-
no-page
r
option
for
gi
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matthieu Moy
M
ore p
e
rmi
s
sive
"git-r
m
--cached" behavi
o
r without -f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
Added a reference to git-a
d
d in th
e
docum
e
ntation for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
Docum
e
nt gi
t
a
d
d -u introdu
c
ed earlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree