repo.or.cz
/
git
/
mingw.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: Manual conflict resolution, part 1/2
2010-08-09
Matthieu Moy
Document -B<n>[/<m
>
], -M<n> a
n
d -C<n>
v
a
ri
a
nts 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
Matthie
u
Moy
pre
t
ty-options
.
t
x
t
: match --format's documentation
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-07-28
Matt
h
ie
u
Mo
y
D
ocument
ls-fi
l
es -t as semi-obsolete
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu
Moy
C
l
arify hel
p
message
w
h
e
n no remote is sp
e
cified in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-03-07
Matt
h
ieu M
o
y
sta
s
h: suggest the corre
c
t com
m
and line for unknown
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
Use git
_
mkstemp_
m
od
e
inst
e
a
d
of pla
i
n
mkstemp to create
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
git_mkstem
p
s_mode: d
o
n't
set errno
to EINVAL o
n
exi
t
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
M
at
t
hi
e
u Moy
Use
git_mkstemp
_
m
ode
and
x
mks
t
emp
_
mode
i
n
o
d
b
_mkstemp
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
git_mkst
e
mp_mode
,
xmkst
e
mp_mode: variants of gitm
k
stemps
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
M
a
tthieu Moy
Mo
v
e g
i
tmkstemps to path
.
c
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-02-22
Matthieu Moy
A
d
d a testca
s
e fo
r
ACL wit
h
restrictive umask
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-19
Matthieu Moy
bran
c
h
:
warn an
d
refuse to set a
branch as a tracking
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matth
i
eu Moy
lockfi
l
e: show absolute
file
n
am
e
in unable_t
o
_lock_message
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Matthieu Moy
Be
mor
e
us
e
r
-friend
l
y when
refusing to do something
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-12
Ma
t
thieu Moy
push: s
p
e
l
l '
N
ote
about fast-fo
r
wards' sec
t
ion name
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2010-01-02
M
a
tthieu Moy
stash
:
mention --patch in usage s
t
ring
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
Matthieu Moy
branch: die
explicitly why when
calling "git branch
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
Mat
t
hieu Moy
SubmittingPatches: hints to
k
now the status
of a submitted
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-31
M
atthieu Moy
buil
t
in-c
o
n
f
ig: add --path option do
i
ng ~ an
d
~user
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-12-07
M
a
t
thieu Moy
Detai
l
e
d diag
n
o
s
is when pa
r
s
i
ng
a
n object name fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matthieu
Moy
bui
l
tin-me
r
ge: sho
w
user-frien
d
ly error mess
a
ges for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-30
Matth
i
eu Moy
merge
-
recursive: make the error-message gen
e
ration
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Ma
t
thieu Moy
u
s
er-manual: Document
that "git merge" doesn
'
t
like
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-23
Matthieu Moy
merge
-
recu
r
sive: point
t
he user to commit when fil
e
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-19
Matthi
e
u M
o
y
expand_user_
p
ath: expand
~
t
o
$
H
OME, not to th
e
actual
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-11-18
Matthieu Moy
Expand ~ and ~
u
s
e
r
i
n core
.
e
x
cludesfil
e
, commit
.
t
e
mplat
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
M
a
tthieu Moy
push: Correctly initialize nonfastforward
i
n
transport_push
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-13
Matthieu Moy
wrap git's main
usag
e
s
tr
i
ng
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-09-02
Matth
i
eu Moy
stash: simplify defaulti
n
g to "save" and reject u
n
known
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Mat
t
hieu M
o
y
re
s
et: make
t
he r
e
minder output con
s
istent with "c
h
eckout"
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-22
Matthieu Moy
Rename REFRESH_SAY_CH
A
N
G
E
D
to REFRESH_
I
N_PORCE
L
AIN
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-18
Matthieu Moy
filter
-
branch: make
t
he usage str
i
ng fit on 80 chars
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-12
Ma
t
t
hieu M
o
y
push: point to
'git pull' and
'
g
i
t push --f
o
rce' in
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-07
Matthieu Moy
Show usage st
r
ing for 'git log -h', 'gi
t
s
h
ow -h
'
an
d
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthi
e
u
M
o
y
git-ls-f
i
les
.
tx
t
: clarify
what "other files" mean for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-06
Matthieu M
o
y
rebase: consis
t
ent error
m
e
ssa
g
es for st
a
ged and
unstaged
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-08-05
Matthi
e
u Moy
Better usage string for reflog
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-20
Matt
h
ieu Moy
clone: add test f
o
r push on an emp
t
y
cl
o
ne
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
M
a
tthieu Moy
Update
g
it-add
.
t
x
t
a
ccording to
t
he new po
s
sibilitie
s
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-19
Ma
t
thieu Moy
git add -p: new "quit" command at the
pr
o
mpt
.
commit
|
commitdiff
|
tree
2009-04-16
M
atthieu Moy
U
pda
t
e gi
t
-add
.
txt according to the n
e
w po
s
si
b
i
l
ities
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-16
Matthieu Moy
git add -p: new "qui
t
" comman
d
at t
h
e prompt
.
commit
|
commitdiff
|
tree
2009-04-08
M
a
t
t
hieu
M
o
y
git-
p
ull
.
sh: better
warning
messa
g
e
for "git pul
l
"
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-list
.
txt:
ma
k
e ascii marku
p
uni
f
orm with other
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Matth
i
eu Moy
git-send-emai
l
.
txt
:
clarify which o
p
tions ta
k
e an ar
g
ument
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
M
atth
i
eu
M
oy
g
i
t-c
h
eckout
.
txt
:
clari
f
y that <branch> applies wh
e
n
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-04-08
Ma
t
t
hieu
Moy
git-ch
e
ckou
t
.
txt: fix incorrect s
t
ateme
n
t
about HEAD
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
M
atthieu Moy
Mor
e
fri
e
ndl
y
message w
h
en locking t
h
e i
n
dex fails
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-20
Matthieu Moy
Docume
n
t gi
t
blame --reverse
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Ma
t
thieu M
o
y
builtin-mv
.
c: check for unversi
o
nned files
b
e
f
o
re loo
k
ing
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matth
i
eu M
o
y
Add a
t
estcas
e
f
or "git
m
v -f" on untracke
d
files
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2009-02-04
Matthieu Moy
Missing &&
i
n t
/
t70
0
1
.
sh
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-04-30
Matthieu Moy
gi
t
-svn: dete
c
t a
n
d f
a
il graceful
l
y when dcommitting
.
.
.
commit
|
commitdiff
|
tree
2008-04-19
Matthieu Moy
Document that WebDAV
d
oesn't need git on the
s
erver
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu Moy
Fix i
n
correct wording in git-merg
e
.
txt
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-11-20
M
a
tthieu Moy
Doc fix for git-r
e
f
l
o
g: mention @{
.
.
.
} syntax, and
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-08-19
M
atthieu Moy
Add and document a global -
-
n
o-pager option for git
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-07-14
Matthieu Moy
More perm
i
ssive "git-
r
m
--c
a
ched"
be
h
avior withou
t
-f
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Matthieu Moy
A
d
ded a
r
efer
e
nce t
o
git-
a
dd
i
n the doc
u
me
n
tation for
.
.
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree
2007-05-07
Ma
t
thieu Moy
Docume
n
t
g
it add -u introduce
d
e
a
rlier
.
Signed-off-by:
Matthieu Moy
<Matthieu.Moy@imag.fr>
commit
|
commitdiff
|
tree