repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Makefile: Fix 'clean' target to remove all gitweb build files
2010-03-21
M
i
c
hael J
Gruber
Documentation/git
d
i
ffco
r
e:
R
e
m
ove misleading date
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J
G
r
uber
Docum
e
ntation/
g
it-reflog: Fix forma
t
ting of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik
Faye-Lund
rev-list: fix --pretty=o
n
eli
n
e with empty message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursi
v
e
:
add a l
a
b
el
f
or ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
e
d
e
r
cherry-p
i
ck, rev
e
rt: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
revert: clarify
l
abel o
n
confl
i
ct h
u
nk
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan
Nieder
c
ompat:
a
dd mempcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
ieder
ch
e
ckou
t
-m --c
o
nflic
t
=diff3:
a
dd a
l
abel for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merge_tre
e
s():
ad
d
a
ncestor label pa
r
a
me
t
er for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
mer
g
e_file()
:
a
dd comme
n
t explain
i
ng behavior wrt c
o
nfl
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
check
o
ut --conflict=diff3: add a labe
l
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge(
)
:
add ance
s
tor label pa
r
ameter for
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
mer
g
e-file --diff3: add a labe
l
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
xdl_merge(): move file1 and file2 labels to xm
p
aram
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
xdl_merge(): add optiona
l
ancest
o
r
label to diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
h
a
n Nieder
tests: document cherry-pic
k
b
e
havior in
face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: do
c
ument form
a
t of conflic
t
s fr
o
m ch
e
ckout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
.
mailmap: Entries fo
r
Alex Be
n
née, Deskin Miller, Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: fix tiny memory
leak in cher
r
y-pick -
-
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Update 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 branc
h
'jk/ma
i
nt-
a
dd-ignored
-
dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
n
o
Merge branch '
m
l/color
-
grep'
commit
|
commitdiff
|
tree
2010-03-20
J
uni
o
C Hama
n
o
Merge bran
c
h
'jc/color-attr
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
a
n
o
Merge branch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
M
e
r
g
e branch
'fl/askpas
s
'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
Mer
g
e branc
h
'bg/apply-fix-blank-at-e
o
f'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Merge branc
h
'bw/
u
n
ion-
m
erge-
r
efactor
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft r
e
lease notes t
o
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Christian
C
ouder
rebase -i: use new -
-
ff cherry-pick
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andr
e
as Gruenbacher
fetch: Fix minor mem
o
ry leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas Gruenbacher
f
etch: Future-
p
roof init
i
alization of a refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
enbacher
fetch: Check for a
"
^{}" suffix wi
t
h s
u
ffixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
jamin C
Meyer
F
i
x a
s
pelli
n
g mistake in a git-p4 console
m
essa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Ger
n
ha
r
dt
U
se
t
est_
e
x
p
e
ct_success fo
r
test
s
etups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben W
a
lton
Modernize gi
t
c
a
lling conventions in
hook tem
p
l
ate
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n
Walton
Make templates
honour SHELL_PATH an
d
PER
L
_PA
T
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imr
e
Deak
da
e
mon: parse_host_
a
nd_port
S
IGSEGV if
p
ort
is specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
than Niede
r
Makefile: Fi
x
o
c
cas
i
onal GIT-CFLAGS b
r
eakag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile:
F
ix CDP
A
TH problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
ran
d
on Casey
t/
t
5505
-
r
emo
t
e
.
sh: escape * to
prevent interpretat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
andon C
a
sey
t5505: add missing
&&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
and
o
n Case
y
t5505: r
e
m
o
ve unnecessary su
b
sh
e
ll invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
C
asey
notes
.
c:
remove inappr
o
pr
i
ate
c
all to ret
u
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull: re
p
lace
u
nnecessary
sed invoca
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C
H
a
mano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-03-17
Thom
a
s Rast
Documentati
o
n: rec
e
ive
.
denyCur
r
e
ntBran
c
h
d
efaults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfort
bash: complete *_HE
A
D refs if present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ha
m
a
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Ander
s
Kaseorg
e
veryda
y
:
f
sck and gc
are not everyday operations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Gust
a
f Hendeb
y
I
m
p
rove error me
s
sages from 'git st
a
sh s
h
ow'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
andon
Casey
da
e
mon
.
c: avoid acce
s
sin
g
ss_family member of
s
truct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brando
n
Cas
e
y
t/t1304: make a second col
o
n
opti
o
n
a
l in th
e
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
r
ights
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
randon C
a
sey
t/t1304: us
e
'test -r'
t
o
test readability rather than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bra
n
don
Casey
t/t1304: set th
e
D
e
fault ACL base entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
andon Case
y
t
/t1
3
04: av
o
id -d option to setfacl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
Junio C Hama
n
o
ref
s
: ref en
t
ry with NULL sha1 is can be a
d
a
n
gling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
René S
c
h
a
rfe
grep: enable
t
h
reading for context line pri
n
ti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Documentati
o
n/g
i
t-read-tree: clarify 2-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
M
i
ch
a
el J Gru
b
er
D
ocu
m
en
t
a
t
ion/git-re
a
d-tree: fix tabl
e
layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
amano
Merge
b
r
a
nch 'sd/format-patc
h
-to'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C Hamano
M
erge branch 'tc/
h
t
t
p-c
l
eanup
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
amano
M
e
rge branc
h
'tc/transport-verbo
s
ity'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Hamano
Merge br
a
nch
'
l
d
/p
u
sh-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ham
a
n
o
Mer
g
e bra
n
ch 'j
h
/notes'
commit
|
commitdiff
|
tree
2010-03-15
Da
v
e Olsz
e
wski
rebase--i
n
t
era
c
tive: don't require w
h
at's re
b
ased to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
ari A
a
lto
git-send-email
.
perl - try to gi
v
e real name o
f
th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
ari Aalto
git-send-ema
i
l
.
perl: add op
t
i
on
-
-sm
t
p-debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari
Aalto
g
it-send-email
.
perl: impr
o
ve erro
r
messa
g
e in send_
m
essage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
tests f
o
r "git
a
dd ignored-d
i
r/file" witho
u
t -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir: fix
C
OLLECT_IGNO
R
ED on exclud
e
d prefixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
u
nio C Hama
n
o
t
0
050: m
a
rk non-w
o
r
k
i
n
g
t
est as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jens L
e
hmann
git status:
i
gnoring untracke
d
fil
e
s must apply to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io C Hamano
Merg
e
branch
'm
a
int'
commit
|
commitdiff
|
tree
2010-03-14
Da
v
e Ol
s
zewski
don't use defaul
t
revision if a
r
e
v
w
a
s
spec
i
fi
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
for_ea
c
h
_recent_reflo
g
_ent():
u
se strbuf,
f
ix offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
t/Make
f
i
l
e:
remove
t
est artifacts upon "make clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
blame: fix inden
t
o
f
line nu
m
be
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Haman
o
Merge git://git
.
bogomips
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
git status: Fix false pos
i
tive
"
new co
m
mits" output
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
R
efactor dirty
submodule
d
etecti
o
n in
di
f
f-l
i
b
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C H
a
mano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-13
Stephen
Boyd
n
o
tes: rework
s
ubco
m
m
a
n
d
s
a
nd p
a
rse options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Rast
git-notes(1): add
a
se
c
tion ab
o
ut the meaning of
h
istory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
note
s
: track whe
t
her n
o
t
e
s
_
t
r
ees were changed at
all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Ra
s
t
notes:
add s
h
ortha
n
d --ref to override
GI
T
_NOTES
_
REF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
co
m
mit --amend:
c
o
py no
t
es to
the new commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
r
ebase: support a
u
tomatic notes copyi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
o
m
as R
a
st
n
otes: imple
m
ent helpers needed for n
o
te
c
opying d
u
r
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
mas Ras
t
notes:
i
m
p
l
em
e
n
t 'g
i
t not
e
s
copy --
s
t
d
in'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
r
ebase
-i: invoke post-rewrite hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s R
a
st
re
b
ase: invoke p
o
st-rewr
i
te h
o
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ras
t
commit --amend: invo
k
e p
o
st-r
e
write hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
Document
a
tion: do
c
u
m
en
t
post
-
r
ewri
t
e hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
Supp
o
r
t
showin
g
note
s
from more than one notes
t
ree
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
Thom
a
s
Ras
t
te
s
t-l
i
b: unset GIT_N
O
TES_RE
F
to stop it from influenci
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Jun
i
o C Hamano
t5516: Us
e
test_c
m
p whe
n
appropria
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Ju
n
io C Hamano
t9400: Use test_cmp when appropri
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge br
a
n
c
h 'sd/init-template'
commit
|
commitdiff
|
tree
next