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
Eri
k
Faye-Lun
d
rev-
l
i
st: f
i
x -
-
pretty=oneline with e
m
pty
m
essa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merg
e
-re
c
u
r
sive: add a label
f
o
r
anc
e
stor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
N
ie
d
er
cherry-pick, r
e
vert: add a
label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
revert: clarify
l
abel on
c
onfl
i
ct hunk
s
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
check
o
ut -m --conflic
t
=diff3:
a
dd a labe
l
fo
r
ancest
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
han N
i
eder
m
erge_trees
(
): add ancestor label pa
r
a
meter for diff
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
merge
_
file():
add comment expla
i
ning be
h
avior wrt conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ch
e
c
k
o
ut --conf
l
ict=
d
iff3:
a
dd
a
label
for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
N
ieder
ll_me
r
ge(
)
:
a
dd anc
e
stor
label paramete
r
f
or dif
f
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nie
d
er
merge-file --
d
iff3: add
a
label for anc
e
stor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_me
r
g
e(): move file1 and file2 labels to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
dl_merge(
)
: ad
d
option
a
l
a
ncestor label t
o
diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
Nieder
test
s
: document cherry-pick behavior in face of
c
o
nflic
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan N
i
eder
tes
t
s: do
c
ument format o
f
conflicts fro
m
checkout -
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
.
mailmap: Entries for Alex Be
n
née, Deskin
M
ill
e
r, Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
re
v
ert:
fix tin
y
memory leak i
n
cherry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C Hamano
Up
d
ate draft relea
s
e notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge br
a
nc
h
'jk/maint-add-ig
n
ore
d
-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Ham
a
n
o
Me
r
ge br
a
nch 'ml/color-
g
re
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge
b
ranch 'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
erge
b
r
a
n
ch 'cc/re
s
et-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io C Hamano
Merge branch 'f
l
/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge b
r
anch '
b
g
/
apply-fix-blank-at-
e
of'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge branch 'b
w
/union
-
merg
e
-
refac
t
or'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Hamano
Upd
a
te dr
a
ft release notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Chris
t
ian C
o
ude
r
rebase -i: u
s
e new --ff cherry-pic
k
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
An
d
reas
G
ruenbac
h
er
fe
t
ch
:
Fix mi
n
or
mem
o
ry
leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas Gru
e
n
bach
e
r
fetch: Future-proof
initiali
z
ation of a re
f
s
pe
c
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas
G
ruenbacher
fetch: Check for a "^{}
"
suffix
w
it
h
suffi
x
cm
p
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n
jamin C Meye
r
F
ix a spe
l
ling m
i
st
a
k
e
in a g
i
t-p4 console m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gern
h
ardt
Use test_exp
e
ct_success
for
test
setup
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
Modernize git callin
g
c
onvent
i
o
ns in hook templates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
Walton
Make templates honour SHELL_PATH and PERL_P
A
T
H
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
I
m
r
e Dea
k
dae
m
on:
parse_host_and_port SIGSEGV if port is specifi
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Mak
e
file: Fix occasional GIT-CFLAGS
breakage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Nieder
Makefile:
Fix CDPATH problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t
/t5
5
05-r
e
mot
e
.
sh: escape
* to prev
e
nt interpretation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Case
y
t5505
:
add missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
t5505: remove
unneces
s
ary subshell
i
nvocations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brand
o
n Casey
notes
.
c
: rem
o
ve inapp
r
o
priate
call to return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boy
d
pu
l
l
:
replace unnec
e
ssary sed
i
nvoca
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C H
a
man
o
M
e
rge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thom
a
s Rast
Documentation
:
receive
.
denyCurren
t
Branch defaul
t
s
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward C
o
mfort
bash: complete *_H
E
AD refs
i
f pr
e
s
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Anders Kaseorg
everyday:
f
sck
an
d
gc
a
re not
e
veryday operations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Gustaf Hendeby
I
mpro
v
e er
r
o
r
messa
g
es from 'git sta
s
h
show'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
B
randon Casey
daemon
.
c
:
avoid accessi
n
g ss_family member o
f
struct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
B
r
a
ndon
Casey
t/t1304: make a second colon optional in the ma
s
k
ACL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brandon Casey
t/t1304: set the ACL ef
f
ective rig
h
ts mask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Brand
o
n
Casey
t/t1304: use 'test
-
r' to
t
est re
a
d
abilit
y
rather than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Bra
n
don Casey
t/t1304: set the Def
a
ul
t
ACL bas
e
e
n
tries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Br
a
ndo
n
Ca
s
ey
t
/
t130
4
:
avoid -d option to
setfacl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-16
Junio C
H
aman
o
re
f
s: ref ent
r
y with NULL sha1 is
can be a
dang
l
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
R
ené Schar
f
e
grep: enable threading for
context line printi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mic
h
ael J Gr
u
ber
Documentation/git-read-tree:
c
l
a
r
ify 2-tr
e
e
mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mich
a
el
J
Gru
b
er
Do
c
umentation/g
i
t-read-tree:
f
ix
table layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Hama
n
o
Mer
g
e
b
r
anch 'sd/form
a
t
-
p
a
tch-to'
commit
|
commitdiff
|
tree
2010-03-15
J
unio
C Ha
m
ano
Merge bran
c
h 'tc/htt
p
-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C Hamano
Mer
g
e branch 'tc/tran
s
port-
v
erb
o
sit
y
'
commit
|
commitdiff
|
tree
2010-03-15
J
unio
C
Hamano
Merge
b
ranch 'ld/push
-
porce
l
ain
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
e
rge branch '
j
h
/
n
otes'
commit
|
commitdiff
|
tree
2010-03-15
Dave Olszewski
reba
s
e
--
i
nteractive:
d
on't requ
i
r
e what's re
b
ased to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
ari
A
alto
gi
t
-
send-email
.
perl -
try to give real name of the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jar
i
A
alto
git-send-email
.
p
erl: ad
d
option -
-
smtp
-
debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jari
A
alto
git-sen
d
-email
.
perl: improve error messa
g
e in send_message()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Haman
o
te
s
ts for "
g
it add ignored-dir/fi
l
e" without -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
eff King
dir: f
i
x COLLECT_IGNO
R
ED on exclude
d
prefi
x
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hama
n
o
t0050:
m
ark non-
w
orking t
e
st as
s
u
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
ens Lehmann
gi
t
status: ignoring un
t
r
a
cked
fi
l
es must app
l
y to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Da
v
e Olszewski
don'
t
use defa
u
lt
r
ev
i
sion if a rev was s
p
ecified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Re
n
é Scharf
e
for_
e
ach_
r
e
c
ent_
r
ef
l
og_ent(): us
e
strbuf, fix off
s
et
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
t/Makefile: remov
e
test artifacts upon "make
c
lean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
bla
m
e: fix i
n
dent of
line numbers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Me
r
ge gi
t
://git
.
bo
g
om
i
p
s
.
o
r
g/git-sv
n
commit
|
commitdiff
|
tree
2010-03-13
Jens
L
ehm
a
nn
git stat
u
s: Fix
f
alse positive "new commi
t
s" outpu
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Jens Leh
m
ann
R
efactor d
i
rty
s
ubmodule d
e
tect
i
on in diff-lib
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Haman
o
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-03-13
Stephen Boyd
notes: r
e
w
o
rk subcommands and pa
r
se options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Ra
s
t
gi
t
-
notes(1):
add a
s
ection about the
meaning
o
f
history
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
no
t
es: track
whe
t
her no
t
e
s
_trees were change
d
at all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Rast
notes: add shorthand --ref to override GIT_NOT
E
S_
R
EF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
commit --ame
n
d
:
copy notes to the new commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Rast
rebase:
supp
o
rt automatic notes cop
y
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Ra
s
t
note
s
:
i
mplement helpers needed f
o
r note copying d
u
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Rast
notes: implement 'git not
e
s
c
opy
-
-stdin
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
rebas
e
-
i
: invoke post-rewrite hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas R
a
s
t
rebase: invoke post-
r
ewrite
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
commit --amend: invo
k
e post-re
w
r
i
t
e h
o
ok
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas Rast
Docu
m
entation: documen
t
p
o
st-rewr
i
te hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
Support showing notes from more than one note
s
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
test-li
b
:
u
n
s
et GIT_NOTES
_
R
EF to stop it f
r
om i
n
f
l
uencing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516: Use test_
c
m
p when appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t9
4
00: Use test_cmp
w
hen a
p
propriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C
Hamano
Merg
e
branch '
s
d/init-t
e
mplate'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Mer
g
e
bran
c
h 'sh/am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merg
e
br
a
nch
'
cp/a
d
d
-
u-pathspec'
commit
|
commitdiff
|
tree
next