repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.1-rc1
2010-03-25
Stephen Boyd
fmt-merge-msg
:
hide
s
um
m
a
r
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Stephen B
o
yd
fmt-merge-msg: remove c
u
s
tom string_list implem
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Stephen
B
oyd
string-l
i
s
t: add u
n
s
o
rted_string_list_lookup()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Step
h
en
B
oyd
fmt-merge-msg: use pretty
.
c routines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Steph
e
n Boyd
t6200: test fmt-mer
g
e-m
s
g more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Stephen B
o
yd
t6200: mod
e
rnize with t
e
st_
t
ick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Stephe
n
Boyd
fmt-merge-msg: be quiet if n
o
thing to
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
J
un
i
o C Hamano
diff --c
h
ec
k
: honor
c
onflict
-
m
arker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge b
r
a
n
c
h 'jh/maint-submodule-sta
t
us-i
n
-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
ge branch
'
tr/n
o
tes-display'
commit
|
commitdiff
|
tree
2010-03-24
J
unio C
H
a
m
ano
Merge bran
c
h 'jl/submo
d
ule-dif
f
-dirtines
s
'
commit
|
commitdiff
|
tree
2010-03-24
J
unio C Hamano
Merge branch 'pb/l
o
g-first
-
pare
n
t-p-m'
commit
|
commitdiff
|
tree
2010-03-24
J
uni
o
C
Ha
m
a
n
o
Merge br
a
nch 'jc/maint
-
r
e
fs-
d
angling'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
H
a
mano
M
e
rge
branch '
m
aint
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
erge branch
'jc/color-attrs' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
b
ranch 'j
k
/
m
aint-a
d
d
-ignored-dir
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o C Ham
a
no
Me
r
ge branch
'bg
/
apply-fix-b
l
ank-at-eof
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2010-03-24
Marc Branchaud
T
e
a
c
h rebase th
e
--no-f
f
op
t
ion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
P
e
a
r
ce
h
t
tp-b
a
cke
n
d: Don't
i
nfi
n
ite loop during di
e
()
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
Co
r
rect references to
/
u
s
r
/bi
n
/python
w
hich does no
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus Heidelberg
Documentation: explai
n
th
e
meaning
o
f "-g" in git-describe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Micha
e
l J Gruber
r
e
v-list:
use d
e
fault
a
b
brev length when a
b
brev
-
c
omm
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
amkumar
R
a
machandra
imap
-
se
n
d: Remove limi
t
atio
n
on me
s
sa
g
e
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
Ju
n
i
o C
Hamano
Git 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
H
amano
Mer
g
e
b
ranch 'maint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-21
Michael J
Gruber
.
mail
m
ap: Map t
h
e the first s
u
bmi
s
sions
of MJ
G
by
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik
F
a
ye
-
Lund
ls: remove redundant log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
c
h
er
r
y: support
-
-abbrev
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael J Gruber
D
o
cument
a
tion/git-clo
n
e:
T
ransform des
c
r
i
ption l
i
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J
G
ruber
Documen
t
ation/urls: Rem
o
ve spuri
o
us ex
a
m
pl
e
markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grube
r
Documentatio
n
/
g
itdiffcore: Remo
v
e
m
isleadin
g
date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/git-re
f
log: Fix format
t
ing of
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-
L
und
re
v
-list: fix --pr
e
t
ty=one
l
i
ne with emp
t
y message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge
-
recurs
i
ve: add a label f
o
r ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nieder
c
h
e
rr
y
-p
i
ck, revert: add a label for
a
ncestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nied
e
r
revert: clarify label on conf
l
ict
hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mem
p
cpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
checkout -m --conflict=diff3: add a l
a
b
e
l
for ances
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nie
d
er
mer
g
e_trees(): add ance
s
tor la
b
el para
m
eter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
ath
a
n Nied
e
r
merge_
f
ile():
a
d
d comment explai
n
ing behavior wrt conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
c
heckout --conflic
t
=diff3: a
d
d a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Ni
e
der
ll_merge(): a
d
d ance
s
tor
label p
a
ramete
r
for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han N
i
ed
e
r
merge
-
file -
-
d
i
ff3: add a label
for ances
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): move file1
and file2 labels
to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
xdl_
m
erge(
)
: add op
t
ional ancestor
label
t
o diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Ni
e
der
tests: doc
u
men
t
cherr
y
-p
i
ck be
h
avior
in face o
f
confli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
Niede
r
tests: d
o
cument format of
conflicts from
c
h
e
ckout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Grube
r
.
mailmap: Entries f
o
r Alex Be
n
née,
D
eskin Mi
l
l
er, Vital
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Ni
e
der
revert: fix tiny memory leak in
c
herry-pick
-
-ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update dr
a
ft 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 branc
h
'jk/m
a
in
t
-add-ign
o
red-dir'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio
C
Hamano
Merge b
r
anch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
e
rge branch
'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge
b
r
a
n
ch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Merge branch 'fl/a
s
kpass'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io C Hamano
Merg
e
bra
n
ch 'bg/appl
y
-
f
ix-bl
a
nk
-
a
t
-eof'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ham
a
no
Mer
g
e branch 'bw/unio
n
-
m
erge-
r
efactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Update draft
r
elease note
s
t
o
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
C
hristian Couder
reb
a
se
-
i: use new --ff cher
r
y-pick option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andre
a
s G
r
u
e
nbac
h
e
r
fetch: Fix
m
inor memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch: Futu
r
e-pro
o
f initializatio
n
of a r
e
fspe
c
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruen
b
acher
fetch: Ch
e
ck for a "^{
}
" suffix with s
u
ffix
c
m
p
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjami
n
C Meyer
F
i
x a s
p
e
llin
g
mistake in a
g
it-p4 console message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bri
a
n Gernhardt
Use
t
e
st_expect
_
success fo
r
test se
t
u
ps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben W
a
l
ton
M
odernize git calling conventions
i
n hook
t
e
m
plates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
M
ake
t
emplates honour SHELL_PATH and PERL_PA
T
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
I
mre Deak
d
aemon: pa
r
se_hos
t
_an
d
_port SIG
S
E
G
V if port is
s
pecified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
ieder
M
akef
i
le:
F
ix occasional GIT-CF
L
AGS breaka
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
than Nieder
M
akefile: Fix CDPATH proble
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
rand
o
n
Casey
t/t550
5
-remote
.
sh: escap
e
*
t
o prevent interpreta
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
randon Casey
t550
5
: add mis
s
ing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
an
d
on Casey
t5505: remove unnecessary subshe
l
l
invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brando
n
Casey
notes
.
c: remov
e
i
napprop
r
i
a
t
e
c
a
ll
t
o re
t
urn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
S
tep
h
e
n Boyd
p
ull: replace unne
c
essar
y
sed invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
unio C Hamano
M
erge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-17
Th
o
mas R
a
st
Documen
t
ati
o
n: receive
.
denyCu
r
rentBranch
d
efaults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
I
an Ward Comfort
ba
s
h
: complete *_HEA
D
refs if present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ham
a
no
Me
r
ge branch
'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseo
r
g
eve
r
yday: fsck
and gc are
n
ot everyday operations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Gu
s
t
af Hend
e
by
Improve error messages
fr
o
m 'g
i
t stash
s
how'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
daemon
.
c: a
v
oid ac
c
essing
s
s_family membe
r
of s
t
r
u
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bran
d
o
n
Casey
t
/t1304: make a
seco
n
d
c
olon optional in
th
e
mask ACL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bran
d
on
C
asey
t
/t130
4
: set the ACL effe
c
tive rig
h
ts mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
randon C
a
sey
t/
t
13
0
4: us
e
'test -r
'
to test reada
b
ility rather than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Br
a
ndon Ca
s
ey
t
/
t1304: set the
D
efault ACL base entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
n
don C
a
sey
t/t130
4
: avoid -d
option
to setfac
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
Junio C Hamano
r
e
fs: ref entry with NULL sh
a
1 is
c
a
n be a dangling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
René Scharf
e
grep: enable threadin
g
for cont
e
x
t
line printing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Documen
t
a
t
ion/git-read-tree: clarify 2-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Micha
e
l J G
r
uber
Documentation/git
-
read
-
tre
e
: fix table
l
ayout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ha
m
ano
Merge bra
n
ch '
s
d/format
-
patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C
H
a
mano
Merge bra
n
ch 'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge
b
r
a
n
ch 'tc/transport-
v
erbos
i
ty'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
erge branch
'ld/p
u
sh-porcelain
'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Hamano
Merge b
r
an
c
h 'jh/not
e
s'
commit
|
commitdiff
|
tree
2010-03-15
D
a
v
e
Ol
s
zewski
rebase--int
e
ractive: don
'
t req
u
ire what's rebased
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
a
r
i Aalto
git-send-email
.
perl - try t
o
gi
v
e
r
e
al name o
f
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
g
it-send-email
.
perl: ad
d
option
--
s
mt
p
-debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next