repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Avoid excessive output for and reprocessing of renames
2010-03-21
E
rik Faye-Lund
rev-l
i
st: fix
-
-pretty
=
oneline
w
i
t
h empty message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nieder
mer
g
e-
r
ecursive: add a labe
l
f
or ances
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nieder
cherry-pick, rev
e
rt: add
a l
a
bel
f
or ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
reve
r
t: clari
f
y la
b
el
o
n conflict hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mempcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checko
u
t -m
-
-conflict=
d
iff3
:
add
a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
merge_trees():
a
dd ance
s
tor label
parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
mer
g
e_
f
i
l
e(): a
d
d
c
omment
explainin
g
be
h
a
v
ior wrt
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nie
d
er
chec
k
o
ut --conflict=diff3: add
a
label for a
n
cesto
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
ll_merge(): add ancestor label parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nied
e
r
mer
g
e-fil
e
--diff3
:
add a label
f
o
r
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
xdl_m
e
rge(): move file1
a
nd
file2 labels to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
xdl
_
merge
(
): add opti
o
nal an
c
estor label to
diff3-st
y
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
t
ests: d
o
cument cherry-p
i
ck b
e
hav
i
or in face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
t
e
sts: do
c
ument
format
of confli
c
ts from che
c
kout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
ma
i
lmap: Entries for A
l
e
x
Bennée, Deskin Miller, Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
d
e
r
revert: fi
x
tiny memory
l
eak in cherry-pick -
-
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update
draft
re
l
ease notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch '
j
k/maint-
a
dd-igno
r
ed-
d
ir'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merge branch 'ml/colo
r
-
grep'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Ha
m
ano
Merge branch '
j
c/color-a
t
trs'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hama
n
o
Merge branch 'cc/r
e
set-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Ham
a
no
Merge branch
'
fl/
a
skpass'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C
Hamano
Merge
b
ranch 'bg/apply-fix-blank-a
t
-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Ha
m
ano
Merge
b
ra
n
ch
'bw/union-merge-re
f
actor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Hamano
Update
draft r
e
lease n
o
tes
t
o
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Christian
C
o
ude
r
re
b
ase -i: use new --ff
ch
e
rry-pick o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas G
r
u
e
nba
c
her
fetch: Fi
x
minor
m
e
mory
l
e
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas Gruenbacher
fetch: Future-p
r
oof
i
nitialization of a refsp
e
c
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas G
r
uenb
a
c
her
fetch: Check f
o
r
a "
^
{}"
s
uffix w
i
t
h su
f
fixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
e
njamin C Meyer
F
ix a s
p
ell
i
ng mis
t
ak
e
in a git-p4 c
o
n
s
ole
m
essa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use test_expe
c
t
_
success for t
e
st setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walt
o
n
Mod
e
rn
i
ze gi
t
c
alling conve
n
t
i
ons
in
hoo
k
tem
p
lates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
Walton
Make templates honour SHELL_PATH
and P
E
RL_PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
daemon:
p
arse_hos
t
_a
n
d_port SIGSEGV
i
f por
t
i
s
s
p
e
c
ifi
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han Nieder
Make
f
ile: Fix occas
i
o
nal GIT-CF
L
A
G
S breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Makefile:
Fix
C
DPATH p
r
obl
e
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
don Casey
t/t5505-remote
.
sh: esc
a
pe * to prevent i
n
terpretation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
a
ndon
Casey
t5505
:
add missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon
Casey
t5505: remove unnecessary su
b
shell invocat
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
note
s
.
c: remo
v
e i
n
appropr
i
a
te call
to return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen B
o
yd
pull: rep
l
ace unnecessa
r
y sed i
n
vocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
unio C Haman
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Documentation: receive
.
denyCurrentBranc
h
defaul
t
s to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfort
ba
s
h
: co
m
plete *_HEAD refs if pr
e
sent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ha
m
ano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-17
A
n
ders
Kaseorg
ev
e
ryday: f
s
c
k
and gc are not everyd
a
y operations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Gustaf Hendeby
Improve
error messages from 'git stash show'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
n
don Casey
daemon
.
c: avoi
d
acces
s
ing ss_fam
i
ly membe
r
of struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Br
a
ndon Casey
t/t1304: make a second co
l
o
n
opti
o
nal in
t
he mask ACL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Case
y
t
/t1304: set
t
he
ACL effective ri
g
hts ma
s
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
ndon Casey
t
/
t
1
304
:
use 'te
s
t -r' to test readab
i
lity rather
th
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1
3
04:
set
t
he Default
A
CL base entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Brando
n
Casey
t/t1304: avoid -d option to setfac
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-16
Junio C
Hamano
refs: ref entry w
i
th NUL
L
sha1 is can
be
a dangling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
René S
c
h
a
rfe
g
r
ep: enabl
e
threading for c
o
ntext line prin
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J
G
ruber
Do
c
u
men
t
ation/
g
it-read-t
r
ee: clar
i
f
y
2-tre
e
me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Doc
u
mentat
i
on/git-
r
ead-tre
e
: fi
x
table l
a
yout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C H
a
mano
Merge b
r
anc
h
'sd/format
-
patch
-
to
'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C
H
a
m
a
n
o
Merg
e
branch 'tc/http
-
cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ham
a
no
Merge br
a
nch
'
tc/transport-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Ham
a
no
Merge branc
h
'
ld/p
u
sh-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
J
uni
o
C
H
amano
Merge branch
'jh/notes'
commit
|
commitdiff
|
tree
2010-03-15
Dave Ols
z
ewski
reba
s
e--intera
c
tive: don
'
t require what's reb
a
sed t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
git-send-email
.
perl
- try to give real n
a
me of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
git-
s
e
nd
-
ema
i
l
.
perl: a
d
d op
t
ion --smtp-debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jari Aalto
git-
s
end-email
.
pe
r
l: improve error message in send_m
e
s
sage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C
Hamano
tests
f
or "git add
ignored-dir/file"
w
ithout -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jef
f
King
d
i
r: fix C
O
L
L
E
CT
_
IGNORED
on exclu
d
e
d
prefi
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C
Hama
n
o
t
0
050: mark n
o
n-
w
orking t
e
st as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Je
n
s Lehmann
git st
a
tu
s
: ignori
n
g untracked fi
l
es must apply to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dav
e
Ol
s
zewski
d
on't use de
f
ault revi
s
ion if a rev was sp
e
cifie
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
R
e
né Scharfe
for_each_recent_reflo
g
_e
n
t(): use
s
t
r
b
u
f, fix o
f
fset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
t/Makefile
:
r
emove test artifacts u
p
on "make clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharf
e
b
l
a
me: fi
x
indent of
line numbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Merge git://git
.
bogo
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
git status: Fix false pos
i
tive "new
commits" output
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Je
n
s
L
ehma
n
n
Refacto
r
dirty subm
o
dule detection in d
i
ff
-
lib
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-03-13
Stephen
Boyd
notes: rework subco
m
mands and pars
e
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
g
i
t-note
s
(1): add a section a
b
out th
e
meaning
o
f history
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ras
t
note
s
: tra
c
k wheth
e
r notes_trees
w
ere
c
h
a
n
ged at
a
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Rast
note
s
:
a
dd short
h
and --ref
t
o ove
r
r
i
d
e
G
I
T_NOTES_R
E
F
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Rast
commi
t
-
-amend: copy notes to
t
h
e
n
ew co
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Rast
rebase: support automat
i
c notes copyi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
mas Rast
notes: impleme
n
t
helpers needed for not
e
copying d
u
r
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
notes: implement '
g
it
n
ot
e
s copy
--stdin'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
reba
s
e -i: i
n
v
o
ke
post-r
e
wri
t
e hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s
Rast
rebase:
invoke post-r
e
write hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
a
st
commit --amend: in
v
oke p
o
st-rew
r
i
t
e hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Ra
s
t
Docume
n
tat
i
on: docum
e
nt post-
r
ewrite
h
oo
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
T
homa
s
Rast
Support sho
w
i
n
g
n
o
tes
f
r
o
m
m
ore than one
n
o
tes tr
e
e
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 Ra
s
t
test
-
lib: unset GIT_NOTES_REF t
o
stop it from influencing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Haman
o
t
5
5
16: Use te
s
t_cm
p
wh
e
n appr
o
priate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C H
a
man
o
t
9
400: Use te
s
t
_
c
mp when appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C Hamano
Merg
e
branc
h
'sd/init
-
templa
t
e'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
a
m
a
no
M
e
rge b
r
a
n
ch
'sh
/
am-keep-
c
r'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
Hamano
Merge branch
'cp/add-u-pathspec'
commit
|
commitdiff
|
tree
next