repo.or.cz
/
alt-git.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-rc0
2010-03-21
Jonathan Nieder
c
o
m
pat: ad
d
mempcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
checkout
-
m
-
-
conf
l
ict=diff3:
add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merg
e
_t
r
e
e
s(): add ancestor label paramete
r
f
o
r
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Ni
e
der
merge_file(): add comme
n
t e
x
plain
i
ng be
h
avior
w
rt conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
checkout -
-
c
o
n
f
lict=dif
f
3: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
l
l_merge(): add anc
e
stor lab
e
l parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-f
i
le --
d
iff3:
add a label f
o
r
ancest
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
i
e
der
xdl_m
e
r
ge(): move
f
ile1
and file2 labels to xm
p
a
r
am
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
x
d
l_merg
e
(
)
:
a
dd option
a
l
a
n
c
e
s
tor labe
l
t
o diff3-s
t
yle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
tests:
d
o
cument ch
e
rr
y
-pic
k
behavior in fac
e
of conflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
Nieder
tests: do
c
u
me
n
t
format of conflicts from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mailma
p
: E
n
t
ries fo
r
Alex Benn
é
e,
Deskin
M
i
ller,
V
italy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: fix t
i
ny m
e
m
o
r
y le
a
k in che
r
ry-pick --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upd
a
te draft r
e
le
a
se
notes
t
o 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o C Hama
n
o
Me
r
ge br
a
nch 'jk/
m
aint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
H
amano
Merge branc
h
'ml/co
l
or
-
grep'
commit
|
commitdiff
|
tree
2010-03-20
J
un
i
o C Hamano
Merge branch 'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Merg
e
b
r
anch '
c
c/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io
C
H
amano
Merge br
a
n
c
h
'fl/as
k
pass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'bg/apply-fix-blank-at-
e
of'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Merge branch 'bw
/
union-merge-
r
ef
a
ctor
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft re
l
ease notes t
o
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
C
hristian Coud
e
r
r
e
base -i: use new --ff cherry-pic
k
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas G
r
u
enbach
e
r
fetch: Fix minor
m
emory le
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbach
e
r
fet
c
h: Future-proof initia
l
iz
a
tion of a ref
s
pec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Grue
n
b
a
cher
fet
c
h: Check for a "^
{
}" suffix wi
t
h suffixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjam
i
n C Meyer
Fix a
s
pelling
m
istake i
n
a gi
t
-p4 co
n
sole message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
rian Ge
r
nhard
t
Us
e
test
_
expec
t
_success for test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n Walto
n
M
odernize g
i
t
calling conventions in h
o
o
k
templ
a
t
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n W
a
lton
M
a
ke templ
a
tes hon
o
ur
S
HELL_PATH and PERL
_
PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
daem
o
n: parse_host_and_por
t
SIGSEGV if p
o
rt is specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
M
akefile: Fix occasional
G
IT-CFLAGS breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
ie
d
er
M
akefil
e
: Fix CDP
A
T
H
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
and
o
n Cas
e
y
t
/t5505-
r
emote
.
sh: escape *
t
o prev
e
n
t i
n
terpretation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Cas
e
y
t5505:
a
d
d
missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t5505: remove u
n
necessary sub
s
hell invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
ran
d
on Casey
notes
.
c
:
remo
v
e inappropriate cal
l
t
o
ret
u
rn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
St
e
phen Boyd
p
u
l
l
: r
e
place
u
nnecessary sed invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
unio C Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thom
a
s Rast
Document
a
tion: receive
.
denyCurrentBranc
h
def
a
ults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
I
a
n Ward Com
f
ort
b
a
s
h: complete *_HEAD refs i
f
present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Haman
o
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseorg
every
d
a
y:
f
sck and gc are n
o
t ev
e
ryday o
p
erat
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Gustaf Hendeby
Improve er
r
or m
e
ssages fr
o
m '
g
it stash sho
w
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
ndon Casey
da
e
m
on
.
c: avo
i
d accessing
s
s_family
member of struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Case
y
t/t1
3
04:
m
a
ke a second colon optiona
l
in
t
he
m
a
s
k ACL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon
C
asey
t
/
t1304: set the
ACL effecti
v
e righ
t
s mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon C
a
sey
t/t1304: use
'
test
-r'
t
o test reada
b
ility
r
ather than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Br
a
ndon Ca
s
ey
t/t13
0
4:
s
et the Default ACL base entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1
3
04:
avoid -
d
option to setfacl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
Junio C
H
amano
ref
s
: ref entry wit
h
N
U
LL
s
ha1 is
c
an be a dan
g
l
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
R
e
né Scharf
e
grep: ena
b
l
e
thr
e
ading for con
t
ext
l
ine printing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Mi
c
h
ael
J Gruber
Documenta
t
ion/git-read
-
t
ree: cla
r
ify
2-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michae
l
J
G
ruber
Doc
u
m
e
ntation/git-read-tree
:
fix tab
l
e
lay
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Haman
o
Merge b
r
anc
h
'sd/format
-
p
a
tch-to'
commit
|
commitdiff
|
tree
2010-03-15
J
u
n
i
o C Hama
n
o
Me
r
ge bra
n
c
h
'tc/http-cle
a
nup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branc
h
'tc/t
r
a
n
sport-verbo
s
ity'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C Hamano
Merge
b
ranch 'ld/push-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C Hama
n
o
Merge bra
n
ch '
j
h/n
o
tes'
commit
|
commitdiff
|
tree
2010-03-15
Dav
e
Olszewski
rebas
e
--i
n
t
era
c
tive: don't re
q
uire what's rebased to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Ja
r
i Aalto
git-send-email
.
p
e
rl - try to give real na
m
e of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
git
-
send-ema
i
l
.
perl:
ad
d
optio
n
--s
m
t
p
-
d
e
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aa
l
to
g
i
t-send-email
.
perl: improve er
r
or message in send_
m
e
ssage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
test
s
f
or "git add igno
r
ed-dir
/
f
i
le" wit
h
out
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff Ki
n
g
dir: fix COLL
E
CT_IGNORE
D
on
e
xcluded pr
e
fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io
C
Hamano
t
0050: mark non-working test as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
git stat
u
s: ign
o
ring untracke
d
files must appl
y
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C H
a
mano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-14
Dave Ols
z
ewski
don't u
s
e def
a
ult revisi
o
n
i
f
a
rev was spec
i
fied
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharf
e
for_each_rece
n
t_reflog
_
ent(): use strbu
f
,
f
i
x off
s
et
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C
H
a
mano
t/Makefil
e
: remo
v
e te
s
t artifacts up
o
n "ma
k
e
clea
n
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scha
r
fe
blame:
f
ix in
d
ent
o
f line
n
umbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C H
a
mano
M
erge git://git
.
b
o
g
omi
p
s
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehma
n
n
git status: Fix fa
l
s
e
positive
"
n
ew commits"
o
utput
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jens L
e
hmann
Refactor dirty submo
d
ule detecti
o
n in
d
iff-li
b
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
J
u
n
i
o C
Hamano
Merge
b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-13
S
t
ephen B
o
y
d
notes:
rewor
k
subcomm
a
nds and pars
e
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Ras
t
gi
t
-
notes(1): add a sectio
n
about the meanin
g
o
f history
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
note
s
: track whether note
s
_tr
e
es were c
h
anged at al
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Rast
notes
:
a
d
d shorth
a
nd --ref to override
GIT
_
NOTES_
R
E
F
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas Rast
c
o
m
m
it
--am
e
nd: copy note
s
to the new commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Ras
t
rebase: s
u
pport auto
m
atic notes copying
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Rast
notes: implement h
e
lpe
r
s needed for note copying d
u
ring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas R
a
st
notes: im
p
lement 'g
i
t notes copy --stdin'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas R
a
st
r
e
base -
i
: invoke post-rewrite hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Ra
s
t
r
e
bas
e
:
invo
k
e post-re
w
rite h
o
ok
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s
R
a
st
commit
-
-
a
mend: invoke post-rewrite hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
Documen
t
ation: document p
o
st-r
e
w
rite
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas Rast
Support showing notes from mo
r
e than one note
s
t
r
ee
Thanks to
Junio C Hamano
for lots of feedback, which greatly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
test-li
b
: unset GIT_NOTES_REF to stop i
t
fr
o
m influenc
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516: Use
t
est_cmp when a
p
propriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
J
unio
C
Hama
n
o
t9400: Us
e
test_
c
m
p
when app
r
opriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
J
un
i
o C
H
amano
Merge
bra
n
ch 'sd/init-t
e
mplate'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Haman
o
M
e
rge branch
'
sh/am-ke
e
p-cr'
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C
Hamano
Merge bra
n
ch '
c
p
/
add-u-pathspec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
a
k
efile: update c
h
eck-doc
s
target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C
Ham
a
no
M
erge branch 'lt/de
e
pe
n
-
built
i
n-sou
r
ce
'
commit
|
commitdiff
|
tree
2010-03-10
Jens L
e
hmann
git
s
ubmodu
l
e su
m
mary:
Handle
H
EAD
a
s a
r
gument when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
show
--f
i
r
s
t
-pa
r
e
n
t
/
-
m
: do not default
to --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next