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
Merge branch 'jl/maint-submodule-gitfile-awareness'
2010-03-24
J
unio C Hamano
Merge bra
n
ch 'jh/maint-submodule-statu
s
-i
n
-v
o
id'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
Merge
b
ranch 'tr/n
o
t
es-di
s
play'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C
H
amano
Merg
e
b
r
anch
'
j
l/submodule-di
f
f-
d
irtin
e
ss'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Merge
branch
'p
b
/log
-
first-parent-p-
m
'
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Hamano
Mer
g
e branch 'jc/maint-refs-da
n
g
ling
'
commit
|
commitdiff
|
tree
2010-03-24
J
unio
C Haman
o
M
e
rge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
H
a
mano
Merge branch 'jc/color-attrs
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
mano
M
erge branch 'jk/maint-add-ignore
d
-dir' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-24
J
u
n
io C
Ham
a
no
Me
r
ge branch 'bg/apply-fix-blank-at
-
eof'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Ma
r
c B
r
anchaud
Teach reb
a
se
t
he
-
-
n
o-ff option
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
S
hawn
O
.
Pearce
h
ttp-bac
k
end:
D
on't
i
nfinite lo
o
p during die()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
.
Tyler Ballance
Corr
e
ct references
t
o /
u
sr/
b
in
/
python w
h
ich does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus Heid
e
lberg
Do
c
um
e
ntation: e
x
plain th
e
meaning of "-g" in
git-describ
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Mic
h
a
e
l J Gruber
rev-list:
u
s
e
d
efa
u
lt a
b
bre
v
length when abbrev-co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ram
k
uma
r
Ramacha
n
dra
i
map-send: Remove li
m
itation on message body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
Hamano
Sync with Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Git
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
J
unio C Hamano
Merge bra
n
ch
'main
t
-1
.
6
.
6'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J
Gruber
.
mailm
a
p: Map t
h
e the fir
s
t subm
i
s
sions
o
f MJG
by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
ls: remove redundant
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
E
r
ik Faye-Lund
c
herry: su
p
port --
a
bbrev option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
G
rube
r
Documentatio
n
/git-clone
:
Transform description list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gr
u
ber
Document
a
tion/urls: Rem
o
v
e
spurious example
ma
r
ke
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gruber
Documentati
o
n/gitdiff
c
o
r
e: Remove misle
a
di
n
g date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
G
ruber
Do
c
umentation/gi
t
-reflog: Fix format
t
ing of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Er
i
k Faye
-
Lund
rev-list: fix --prett
y
=
oneline with empty
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
merg
e
-recursiv
e
: add
a label for
a
ncestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-
p
ick, revert: add a label
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
re
v
ert: cl
a
rify l
a
b
e
l on conflict hun
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
compat: add memp
c
p
y()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
Ni
e
der
check
o
ut -m
--conflict=dif
f
3: a
d
d a lab
e
l
for anc
e
st
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
merge_tre
e
s():
a
dd ancestor
l
abel parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_fi
l
e()
:
add comment expla
i
n
ing beh
a
vior wrt con
f
lict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout --conflict=diff3: add a label
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge
(
): add ancestor labe
l
parameter
for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
ieder
merge-f
i
le --dif
f
3: add a
label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
xd
l
_
merge
(
): move file1 and file2 labels to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Ni
e
der
xdl
_
merge
(
): add optional anc
e
stor label to diff3-styl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: document che
r
ry-pick
b
eh
a
vior in face of con
f
licts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
e
s
ts: document fo
r
m
at of conflicts from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
G
r
u
ber
.
mai
l
map:
Ent
r
i
e
s fo
r
Alex Bennée, Desk
i
n M
i
l
ler,
Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
r
e
v
ert: f
i
x tiny memory leak i
n
ch
e
r
r
y-pick
-
-ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C
H
a
mano
Upd
a
te draft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'jk/main
t
-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Merge
b
ranch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
Merge branch 'jc/color-a
t
trs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
m
a
no
Merge branch
'
c
c/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
M
erge bran
c
h
'
f
l/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Merge
b
ranch 'bg/apply-fix-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Me
r
ge branch 'bw/union-merge
-
ref
a
cto
r
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Ha
m
a
no
Merge branch
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Update dra
f
t re
l
ease notes to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Chris
t
ian Couder
rebase -
i
: use new --ff
c
her
r
y-pick op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
e
as Gruenbach
e
r
fetch: Fi
x
minor
mem
o
ry leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas Gruenbacher
fetch: Future-pro
o
f initialization
o
f
a refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbache
r
fetch: C
h
eck for
a
"^{}" suffix
w
it
h
suff
i
xcmp
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meyer
Fix
a
s
p
elling
m
istak
e
in a git-p4 conso
l
e
m
es
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use
t
est_
e
x
p
ect_success
f
or
test setu
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben W
a
lton
Mod
e
rnize git ca
l
li
n
g conventions
in hook
t
emplates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben
W
a
l
to
n
Make
tem
p
lates hono
u
r
SHELL_
P
ATH and PER
L
_PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imr
e
Deak
daemon:
par
s
e_host_a
n
d_port S
I
GSEGV if port is specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
iede
r
Makefile: Fi
x
o
ccasional
G
IT-CFLAGS breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nied
e
r
Makefile: Fi
x
CDPATH probl
e
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t/t5505-remo
t
e
.
sh: escape * to pr
e
ven
t
interpreta
t
io
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brando
n
C
asey
t5505: add mi
s
s
i
ng &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
don Casey
t5505: remove unnecessary subshell invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
Casey
n
o
tes
.
c: rem
o
v
e
inappropriate call t
o
return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull
:
replace un
n
ece
s
sary sed i
n
voc
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C
Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Tho
m
as
Rast
Documentation: rec
e
ive
.
d
e
n
yCurren
t
B
ranch defaults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian War
d
Comfort
bash: c
o
mplete *_HE
A
D refs
i
f present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C
Ha
m
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseorg
ev
e
ryday:
fsck and gc are not everyday
o
per
a
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Gustaf Hendeby
I
mp
r
ove e
r
ror m
e
ssages from '
g
i
t
stash sh
o
w'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Br
a
ndon
Casey
d
aem
o
n
.
c: avoid
a
ccessing ss_fa
m
ily member of s
t
ruct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bra
n
don Casey
t/t1304: make a sec
o
n
d
colon optional in th
e
mask AC
L
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bra
n
d
on Case
y
t/
t
1304:
s
et the
A
CL effec
t
i
ve righ
t
s mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
an
d
on C
a
sey
t/t13
0
4
:
use
'
test -
r
' to
t
est readability
rather than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
nd
o
n
Cas
e
y
t/t1304: set the
D
efaul
t
ACL
b
ase entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
andon Cas
e
y
t/t1304: avoid
-d option to setfacl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
Junio
C Hamano
refs: ref entry
w
ith NULL
s
ha1
i
s can be a dangling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
René Scharfe
g
rep:
e
nable
threading fo
r
c
o
n
te
x
t line printing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gr
u
ber
Documentat
i
on/g
i
t-r
e
a
d
-tree: clarify
2
-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Documentatio
n
/git-read-tree: fix
table layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Hamano
Me
r
ge branch 's
d
/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge b
r
anch 'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Ha
m
ano
Mer
g
e
branch 'tc/tran
s
p
or
t
-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C Hamano
Merge
bran
c
h
'
l
d/push-po
r
cela
i
n'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Hama
n
o
Merge
b
ranch 'jh/not
e
s'
commit
|
commitdiff
|
tree
2010-03-15
Dave O
l
s
z
ewski
rebase--int
e
ractive: don't require what's reb
a
sed to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jar
i
Aalt
o
git-send-email
.
perl - t
r
y
to give
r
eal
n
am
e
of
t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
g
i
t-sen
d
-email
.
p
erl: add op
t
i
o
n --smtp-debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
a
ri Aal
t
o
git-send-email
.
perl:
improv
e
e
r
ror
message i
n
send_message()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C Haman
o
te
s
ts f
o
r "git add
ignored
-
dir/file" w
i
thout -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff Ki
n
g
dir:
f
ix CO
L
LECT_IGNORED on excluded pref
i
xes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
u
nio C Hamano
t0050: mark no
n
-
worki
n
g te
s
t
as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehm
a
nn
g
it
s
t
a
t
us: ignoring untracked f
i
les m
u
st apply to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-14
Dave Ol
s
z
e
w
ski
don't use d
e
fault
revision if a rev
was specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
harfe
for_each_r
e
cent_reflo
g
_
e
nt():
u
se strbuf, fix offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next