repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/fmt-merge-msg'
2010-03-21
Jo
n
athan
Nieder
ll_m
e
rge
(
): add ancesto
r
l
abel
parameter f
o
r dif
f
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
merge-file --
d
iff3: add
a
label for
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_
m
e
rge(
)
: mov
e
file1 and file2 label
s
to
x
m
param
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_m
e
rge()
:
add opt
i
onal ancestor la
b
el to
d
if
f
3
-
style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
th
a
n Nieder
tests: document cherry-pick beh
a
vior in face
o
f conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
te
s
ts: document f
o
rmat o
f
co
n
flict
s
from
c
heckout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J
G
ruber
.
mailmap:
E
n
t
ries for Alex Be
n
née, Deskin Miller, Vita
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n
Nieder
revert: fix ti
n
y memor
y
l
e
a
k
in
ch
e
rry-pick --f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
U
p
d
ate
d
raft release notes to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
Ham
a
no
Merg
e
branch 'jk/maint-add-ignored-
d
ir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
erge branc
h
'
ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch
'jc/
c
olor-attr
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Me
r
ge branch 'fl/askpas
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Ha
m
ano
M
erge branch 'bg/apply-
f
ix-bla
n
k
-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Ha
m
ano
Merge
branch 'bw
/
u
n
ion-merge-
r
ef
a
ctor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft
r
eleas
e
notes t
o
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Christian Coud
e
r
rebase -i: use ne
w
--f
f
cherry-pick o
p
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruen
b
ache
r
fetc
h
: Fix mi
n
or
memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
And
r
e
as
G
ruenbacher
fetch: Fu
t
ure-p
r
oof init
i
alization of a
refspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andr
e
a
s Grue
n
b
a
cher
fetch:
Check f
o
r
a
"^{}" suf
f
ix with suffixc
m
p()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
e
njamin C Meyer
Fix a sp
e
lling
mistake in a gi
t
-p4 co
n
s
ole
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhar
d
t
Use t
e
st
_
expect_succes
s
for
t
est setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n Walton
Mod
e
rn
i
ze git call
i
ng
c
onventi
o
ns in hook
te
m
plates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walt
o
n
M
ake temp
l
ates h
o
n
our
SHE
L
L_
P
ATH
a
n
d
P
ERL_P
A
TH
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre D
e
ak
daemon: parse_host_and_port
S
I
G
SEGV if
p
or
t
is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile: Fix occasional GI
T
-CFLAGS breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
atha
n
Nieder
Makefil
e
:
Fix CDPAT
H
probl
e
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Cas
e
y
t
/t550
5
-
remote
.
sh: escape * to prevent interpr
e
tation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
don Casey
t55
0
5
:
a
d
d missing
&
&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brand
o
n
Casey
t5505: remove un
n
ecessary subshell
i
n
vocations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brand
o
n Casey
notes
.
c
:
remove i
n
a
p
propri
a
te call
t
o return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Step
h
en B
o
yd
pull: repl
a
ce unnec
e
s
sary se
d
inv
o
cati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ha
m
ano
Merg
e
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Ras
t
D
o
c
ument
a
t
ion: re
c
e
ive
.
den
y
CurrentB
r
anch defaults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ia
n
W
a
rd Comfo
r
t
bash: complete *_HEAD refs if
p
resent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ham
a
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kase
o
rg
ev
e
ryday: fsck and
g
c are not e
v
eryday operatio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Gu
s
taf Hendeby
Improv
e
error messa
g
e
s from
'
git stas
h
show'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
daemon
.
c
: avoid
a
ccessing
s
s_fam
i
ly mem
b
er of stru
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1304: m
a
ke a second
c
olon optional in the mask ACL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1304: set the ACL effective rights mask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Ca
s
ey
t/t13
0
4: use '
t
est -r' to te
s
t readability rather
t
h
an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Cas
e
y
t/t13
0
4: se
t
th
e
Default AC
L
b
a
se entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t
1
304: avoid -d option to
set
f
acl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-16
Junio C Hamano
r
e
f
s: r
e
f entry
w
ith NULL sha1 is can
b
e a d
a
ngling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
René Scharfe
grep: enable threading f
o
r con
t
e
x
t line printin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Documentation/git-read-tree: c
l
ari
f
y 2-
t
ree merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
M
ich
a
el J Gruber
Documentation/g
i
t-
r
e
a
d-tree: fix tabl
e
la
y
o
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge
b
ranch 's
d
/for
m
at-patch-t
o
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch
'
tc
/
http-c
l
eanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge bra
n
ch
'
t
c/tra
n
s
p
o
r
t-ve
r
bosity'
commit
|
commitdiff
|
tree
2010-03-15
J
u
ni
o
C Hamano
Merge branch 'ld/push
-
porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C H
a
mano
M
erge branch 'jh/
n
otes'
commit
|
commitdiff
|
tree
2010-03-15
Dave O
l
sz
e
wski
rebase--interactive: don't requi
r
e
w
h
a
t's r
e
b
ase
d
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
gi
t
-s
e
nd-emai
l
.
perl - tr
y
to give
real name
of th
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jari
Aalto
git-s
e
nd-e
m
ail
.
perl: ad
d
opti
o
n
-
-smtp-debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
ari Aa
l
to
git-send-e
m
a
il
.
p
erl
:
imp
r
o
ve error mess
a
ge
i
n
send_mess
a
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io
C Hamano
tests fo
r
"git add
i
gnore
d
-di
r
/fi
l
e" wi
t
hout -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
eff King
d
i
r
: fix COL
L
ECT_
I
GNORED on excluded
p
refixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C
Hamano
t0
0
50:
m
a
rk non-worki
n
g
t
est a
s
s
uch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
g
it
s
t
a
tus: igno
r
ing untr
a
c
ked files must apply to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C H
a
m
an
o
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dave Olsz
e
wski
don't use defa
u
l
t revi
s
ion if a
r
ev was spec
i
fied
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
for_e
a
ch_recent_reflog_e
n
t(
)
: use strbuf, fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C Hama
n
o
t
/Makefi
l
e: rem
o
ve t
e
st artifact
s
upon
"make clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Sc
h
arfe
bla
m
e: fix
i
ndent of line numbe
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C
Ham
a
no
Merg
e
git
:
//git
.
b
ogomips
.
o
r
g/g
i
t-svn
commit
|
commitdiff
|
tree
2010-03-13
Jen
s
Lehmann
g
i
t
status: Fix false
positive "new
c
ommi
t
s
" output
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Jens L
e
h
mann
Refactor dirty submodule detectio
n
in dif
f
-lib
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C H
a
mano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-13
Stephen Boyd
note
s
:
rework subcomman
d
s and parse option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Rast
git-notes(1): add a s
e
c
tion abou
t
the mean
i
ng of history
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas R
a
st
n
o
t
e
s:
t
rack
w
h
ether
n
ote
s
_trees were change
d
at all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
notes: add
shortha
n
d --ref
t
o ove
r
r
i
de
G
I
T_NOTES_REF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Rast
commit --amend:
c
opy notes to
t
he new comm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
rebase: suppor
t
automatic no
t
e
s co
p
ying
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Ras
t
notes: implemen
t
h
e
lpers ne
e
ded for note copying during
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
notes: imp
l
ement 'git notes copy -
-
stdin'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
rebase -i
:
invoke
p
ost
-
rewrite hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as
R
as
t
re
b
a
s
e: invoke
post-rewrite hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
h
o
mas Rast
commit --amend: invoke post-rewrit
e
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Rast
Documentat
i
on: docum
e
nt post
-
rewrite
h
o
o
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s R
a
st
S
u
pport
s
h
o
wing notes
f
rom
m
ore than one notes tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s
Ra
s
t
t
e
st-lib:
u
nse
t
GIT_NOTES_REF
to stop i
t
from infl
u
encing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hama
n
o
t55
1
6: Use t
e
s
t_cm
p
when
a
p
p
r
opriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t
9
400: Use test_cmp when app
r
opriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
amano
M
erge bra
n
ch 'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C H
a
mano
Me
r
g
e
branch 'sh/am-ke
e
p-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ha
m
ano
Merge branch 'cp/add-u-p
a
th
s
pec'
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C Hamano
Makefile: up
d
a
t
e check-d
o
c
s
target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Mer
g
e
b
r
a
n
ch 'lt/deep
e
n-builtin-
s
ourc
e
'
commit
|
commitdiff
|
tree
2010-03-10
J
ens Lehmann
git
su
b
module
s
u
mmary: Handle HEAD
as arg
u
m
e
nt whe
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
show --first-
p
ar
e
nt/-m: do not default
to --cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
show -c: s
h
ow patch text
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
revis
i
o
n
:
in
t
r
o
duce
setup_revisi
o
n_opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-09
Junio C
H
amano
t4013: add tests
fo
r
l
og -p -m --firs
t
-
p
a
ren
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
D
ocum
e
n
t
ati
o
n:
i
mpr
o
ve description of "git reset -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
send-email: ad
d
--no
-
cc,
--no-to,
a
nd --no-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next