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
test-lib: Let tests specify commands to be run at end of test
2010-03-21
J
o
nathan
N
i
eder
m
erge-recursive: add a la
b
el for
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
c
h
erry-
p
i
c
k,
r
evert:
add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
r
e
v
ert: clari
f
y l
a
bel
on confl
i
ct hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
co
m
pat: add mempcpy(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Ni
e
der
checkout -m
--c
o
nflict=diff3:
add a labe
l
for
ancesto
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
th
a
n
Nieder
me
r
ge_trees(): add
a
n
c
estor label para
m
eter for
d
i
f
f3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
de
r
merg
e
_file():
a
dd
c
omme
n
t explaining behavior wrt
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
check
o
u
t -
-
c
onflict=diff3: add a label
f
or ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n Nied
e
r
ll_mer
g
e(): add ancestor
l
abel p
a
rameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nieder
merg
e
-file --diff
3
: add a la
b
e
l for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_mer
g
e(): move file
1
and fi
l
e2 labels to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
a
n Nieder
xdl_merge(): add opt
i
onal a
n
c
e
sto
r
l
ab
e
l t
o
diff3-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
h
a
n
Nieder
tests: doc
u
ment che
r
ry-pick behavior in
f
ace of co
n
flic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: document form
a
t of conflic
t
s from c
h
ec
k
out -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gru
b
er
.
mail
m
ap: Ent
r
ies
f
or Alex Bennée, D
e
skin Miller
,
V
i
taly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
rev
e
rt:
f
ix
t
i
ny memory leak
i
n ch
e
rr
y
-pick --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hama
n
o
Update draf
t
release
n
o
t
es
t
o 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Hamano
Mer
g
e br
a
nch
'
jk/mai
n
t
-
add-
i
gnored-
d
ir
'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
Merge branch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Ha
m
a
n
o
Merge b
r
anch 'jc/color
-
a
t
trs'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
M
e
rge branch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
mano
Mer
g
e branch 'fl/ask
p
ass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Haman
o
Merge
b
ranch
'
bg/apply-fix-blank-
a
t
-
eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
Merge branch 'bw/union-merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-20
J
u
ni
o
C Hamano
Update
draft release notes to
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Christian Couder
rebase -i: use new --ff ch
e
r
ry-
p
ick option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas Gruenbacher
fetch: Fix
mi
n
or memory
leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruen
b
ach
e
r
fetch: F
u
ture-pro
o
f init
i
alization
of a refs
p
ec o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andr
e
as Grue
n
bacher
f
e
t
c
h
: Che
c
k for
a
"
^{}
"
suf
f
ix wi
t
h suffi
x
cmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
enjami
n
C
Meye
r
F
i
x
a spelling
m
i
stak
e
in a git-p4 console message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernh
a
rdt
Use tes
t
_
e
xpect_success for test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
W
a
lton
Mode
r
n
ize git calling
conventions
in h
o
ok templat
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben W
a
lt
o
n
Make templat
e
s
ho
n
our SHELL_
P
ATH and PERL_PA
T
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Im
r
e
Deak
daemon: parse_hos
t
_and_p
o
rt SIGSEGV if port is
specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han Ni
e
der
M
a
kefile:
F
ix occasional GIT-CFLAGS br
e
akage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Makefile: Fix CDPAT
H
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
Casey
t/t
5
50
5
-remote
.
s
h: escape
* to
p
revent in
t
erpretation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t
5
505: add missi
n
g &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bran
d
on C
a
s
e
y
t5505
:
remov
e
u
n
necessary subshell invoca
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brando
n
Casey
notes
.
c: remove
i
nappropriate call to r
e
turn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
St
e
phen Boyd
pu
l
l: repla
c
e
u
nne
c
essary sed
i
nvo
c
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
u
n
io C Hamano
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Documentation: receive
.
denyCurrentBra
n
c
h
defaults
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
I
an Ward Comfor
t
b
ash: complete *_HEAD re
f
s if pres
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
u
nio C Hamano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseo
r
g
everyday: fsc
k
an
d
gc
a
r
e
n
o
t e
v
eryday opera
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Gust
a
f Hend
e
by
Imp
r
ov
e
erro
r
messages from
'git stas
h
show'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bran
d
o
n Case
y
daemon
.
c
:
avoid accessi
n
g s
s
_family
member of stru
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Bran
d
on Case
y
t/t1304: make a second colon optiona
l
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 effect
i
ve
rights mask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t
1
304
:
use 'te
s
t -r' to test r
e
ad
a
bility rather t
h
an
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon
C
asey
t/t1304: se
t
the De
f
ault ACL base entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t
1
30
4
:
a
void
-
d o
p
tion to setfacl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
Junio
C
Ha
m
an
o
refs: ref entry w
i
th
NULL sha1 i
s
can be a dang
l
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
R
ené
S
charfe
grep: enable threading for c
o
ntext
line print
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
D
o
cume
n
ta
t
io
n
/
g
it-read-tre
e
:
c
larify
2
-tr
e
e merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
M
i
chael J
Grub
e
r
D
o
c
umen
t
ation/git
-
read
-
t
ree:
fix t
a
ble layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merge br
a
nch 'sd/fo
r
mat-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge br
a
nch 'tc/http-cl
e
anup
'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hamano
Merge br
a
nch 'tc/transport-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch
'
ld/pu
s
h
-
porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merge branch
'jh/n
o
te
s
'
commit
|
commitdiff
|
tree
2010-03-15
Dave O
l
sze
w
ski
rebase--interactive: don't
r
e
q
ui
r
e wha
t
'
s
r
ebas
e
d to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aal
t
o
git-send-email
.
p
er
l
- try to give
real
n
ame of
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalt
o
git-send-email
.
perl: ad
d
opt
i
on --sm
t
p
-de
b
ug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
gi
t
-
s
end-em
a
il
.
p
e
rl: improve
e
rror message
i
n
send_messag
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C H
a
m
a
no
tests
f
or "g
i
t add igno
r
ed-dir/file" wit
h
out -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
K
ing
d
ir: fix COLL
E
CT_I
G
N
OR
E
D
on exclude
d
p
r
efixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io C Haman
o
t0050: mark no
n
-wor
k
i
n
g
t
est as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehmann
git status: ignoring untracke
d
files mu
s
t apply to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C
Hama
n
o
Merge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2010-03-14
Dave Olszewski
don't use default r
e
vision if a rev
w
as sp
e
cified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
for_ea
c
h_r
e
c
en
t
_reflog_ent():
u
se strbuf, fix offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ju
n
i
o C Hamano
t/Makefi
l
e: remove test artifacts upon "make clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Scharf
e
b
l
a
me: fix
i
n
dent
o
f line numbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C Ha
m
ano
Me
r
g
e
git
:
//git
.
bogo
m
ips
.
org
/
gi
t
-
s
vn
commit
|
commitdiff
|
tree
2010-03-13
Jens Leh
m
ann
git status: Fix fal
s
e positi
v
e
"new commi
t
s" outp
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehma
n
n
Refac
t
or dirty submodul
e
detection in d
i
ff-lib
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o C
H
a
m
ano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2010-03-13
Ste
p
hen
B
o
y
d
notes: rework
s
ub
c
o
m
mands and par
s
e opti
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas Ra
s
t
g
i
t-not
e
s(1): add
a
section abou
t
the m
e
aning of hist
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Rast
not
e
s: track whether notes_trees we
r
e changed at
all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ras
t
notes: add
s
horthand -
-
ref t
o
o
verr
i
de GIT_NOTES_
R
EF
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
commit --amend: copy notes to the n
e
w commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
ma
s
Rast
r
ebase: support automatic
notes c
o
pying
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas R
a
s
t
notes: imp
l
ement help
e
rs needed for note copying during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
not
e
s: i
m
plement 'git notes copy --stdin'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas
Ra
s
t
r
e
base
-
i: invok
e
po
s
t-rewrite h
o
ok
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
o
mas Rast
r
eb
a
se
:
invoke post-r
e
write hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
commit --
a
mend: invo
k
e post
-
rewrite hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas Rast
D
o
cum
e
ntation: document po
s
t-rewri
t
e hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Rast
Suppo
r
t showing
n
otes from more
t
h
a
n one notes tree
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
T
homas Rast
test-lib: unset GIT_NOTES_R
E
F to
s
top
i
t from infl
u
encing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio
C
Ham
a
no
t551
6
: Use test_cmp when appropriat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Ham
a
no
t9400: Use test_
c
m
p
when appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hama
n
o
Merge
b
ranch 'sd/i
n
it-
t
emp
l
ate'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hama
n
o
Merge br
a
nch
'sh/am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C H
a
m
a
no
Merge branch 'cp/add-u-pathspec'
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C H
a
mano
Mak
e
f
i
le: update check-docs target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next