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 branch 'dm/make-threaded-simplify'
2010-01-19
Jim Meyering
grep: NUL terminate in
p
ut fr
o
m a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenbacher
b
uiltin-apply
.
c: Skip
filenames without enough c
o
mp
o
nents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Ha
m
a
n
o
s
ymlinks
.
c
:
remove
u
n
used functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C
Hamano
obje
c
t
.
c: re
m
ove
u
nu
s
ed
function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C Ham
a
no
Docum
e
nt that m
e
r
ge stra
t
eg
i
es can no
w
ta
k
e their
o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very P
e
n
n
arun
Extend merge-subtree tests to tes
t
-Xsubtre
e
=d
i
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C Hama
n
o
M
a
ke "subtree"
part more
orthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Ha
m
a
no
pull: Fix parsing
o
f -X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penna
r
un
T
each git-pull to pass -X<
o
pti
o
n
> to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git
merge
-X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
Hama
n
o
U
p
date draft release notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
aman
o
M
erge br
a
nch 'tc/t
e
st-l
o
cate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch
'
j
h/commi
t
-status'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hamano
Merge branch
'
jn/ma
k
efi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch 'jc/maint-1
.
6
.
1-checkout-m-custo
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 't
c
/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge br
a
nch 'tc/smart-http-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge br
a
nch
'
jk/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merg
e
branch 'sr
/
gfi-options
'
commit
|
commitdiff
|
tree
2010-01-17
Jens
L
ehmann
git st
a
tus: S
h
ow uncommitted s
u
b
m
o
d
u
l
e
ch
a
ng
e
s
t
oo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Hamano
U
pdate COPYIN
G
with G
P
Lv2 w
i
th n
e
w FS
F
address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
us
e
r_ide
n
t
_suffic
i
ently_given(): re
f
actor
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_id
e
nt_sufficiently_given():
r
efactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
rerere:
h
o
nor conflict-mark
e
r
-
size att
r
ibute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rerere:
prep
a
re
f
o
r customizab
l
e
c
onflict marke
r
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
c
o
mmit
.
c::print_summa
r
y: do n
o
t release t
h
e form
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflic
t
-marker-size: ne
w
a
ttribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
e
r
e
re: us
e
ll
_
merge() i
n
st
e
ad of using
x
dl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Hamano
merge-tree
:
use ll_merge() not xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
xdl_merge(
)
: allow passing down marker
_
size in
x
mp
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
man
o
xdl_merge(): introduce
xmparam_t for merge specifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
git_att
r
():
fix fun
c
tion si
g
n
a
tu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Si
x
t
Do not use date
.
c:tm_to
_
t
i
me_t(
)
from c
o
mpat/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
An
d
rzej K
.
Haczew
s
k
i
MSVC:
W
indows-native implementation for subset of Pthre
a
ds API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
ano
M
e
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
Merge b
r
anc
h
'cc/reset-mo
r
e'
commit
|
commitdiff
|
tree
2010-01-17
Ram
k
umar Ramachandra
D
ocumentation:
U
pdat
e
git c
o
re
t
ut
o
rial
c
lar
i
fyi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay J
o
nes
M
S
VC: Fix an "incompatible pointer types" compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windows: avoid the "dup dance" when spawning a child
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windows: simplify the p
i
pe(2)
i
mplem
e
nt
a
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
o
h
annes
S
ixt
Wi
n
dow
s
: boost
s
tartup
by
avoiding
a
static dependency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Erik F
a
y
e
-Lund
Wi
n
dows:
d
isab
l
e Python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
man
o
T
each dif
f
t
h
at modified submod
u
le direct
o
ry is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jens
L
ehmann
Sh
o
w submodules as m
o
dified when
t
hey contain a dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ilar
i
Liu
s
vaara
Add p
u
sh --set-ups
t
r
eam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Christian Couder
t7111: fix ba
d
H
EAD in tests with u
n
merged ent
r
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id
Aguil
a
r
difftool: Update
c
o
p
yrigh
t
notices
t
o
l
i
st each
year
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
R
ich
a
rd Weinberg
e
r
Fix uninitialized variable in
get_refs_via
_
rsync()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Tarmig
a
n Caseb
o
l
t
Tes
t
t5560:
F
i
x test wh
e
n
run with dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Nguyễn Thái
Ngọc Duy
status: only touch path we may n
e
ed to check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftool: U
s
e eval to expa
n
d '-
-
extc
m
d' expressions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Agu
i
la
r
d
ifftool: Add '-x' and as an alias f
o
r '--extcmd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguil
a
r
t7800-difftool
.
sh: Si
m
plify t
h
e -
-
ext
c
md test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --no-index:
allow use of "git grep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
Hamano
gre
p
:
prepare t
o
run out
s
i
de of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ramkumar Ramacha
n
dra
Document g
i
t-blame tri
p
le -C opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Potapo
v
fast-import:
tag ma
y
poi
n
t to an
y
o
bject type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
J
e
f
f
King
c
ommit:
allow supp
r
e
s
s
i
on of i
m
p
li
c
it identity
a
dvice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
King
c
o
mmit: s
h
ow intere
s
ting ident information in summar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff K
i
ng
strbuf: add strbuf_addbuf_pe
r
c
e
n
tquote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff K
i
ng
s
t
rb
u
f_expand
:
c
onvert "%%" to "%"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
ty
rebase -i: Retain user
-
e
d
ited
c
om
m
it me
s
s
ages aft
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
ty
t3404:
Set up
m
ore
of the t
e
st repo
in the "set
u
p"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael
Haggert
y
re
b
ase -i:
F
or fixup commands without
s
quashe
s
, do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase -i: Change func
t
ion
make_squash_
m
e
s
sage int
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Haggerty
r
ebase -i: Extract
funct
i
on do_with_
a
u
thor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
re
b
ase -i:
H
andl
e
the aut
h
or script all in one
place
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michae
l
Hag
g
erty
rebase -
i
:
Extract
a
function "c
o
mmit_me
s
s
a
ge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ic
h
ael Haggerty
rebase -i: Simplify commit counting
f
or
g
enerated commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
e
base -
i
:
Improv
e
consi
s
tency
of comm
i
t count in
generated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Hagge
r
t
y
t
3
404: Test t
h
e comm
i
t count
i
n commit m
e
s
sages generated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chae
l
Hagge
r
ty
rebase -i: Introduce a constant AM
E
ND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
ebase -i:
Intr
o
duce a constant AUTHOR_SCR
I
P
T
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael H
a
ggerty
re
b
ase -i:
D
ocumen
t
h
o
w tempo
r
ary
f
iles are
used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michae
l
H
ag
g
erty
rebase
-
i:
Use symbolic constant $MSG
c
onsiste
n
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
re
b
ase -i:
U
se "test -n" instead of "test ! -z"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mich
a
e
l Haggerty
rebase -i: Inline
exp
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Hagger
t
y
rebase -i: Re
m
ove dead code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
chael
Haggerty
r
eb
a
se -i: M
a
ke the co
n
d
i
tion for an "if" more transparent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
Me
r
ge bran
c
h 'jc/c
h
ecko
u
t
-
merg
e
-base'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C Hamano
Mer
g
e bra
n
ch 'rs/main
t
-archive-match-
p
a
th
s
p
ec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'il/vcs-help
e
r'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_add
b
uf(): allow pa
s
sin
g
the same buf to d
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hama
n
o
Merge bra
n
c
h
'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
t7502: te
s
t
commit
.
statu
s
, --status and
-
-no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
grep
:
r
i
p out
p
e
ssimization to use fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep:
rip
o
ut suppor
t
for
e
xternal grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
a
mes P
.
Howa
r
d, II
comm
i
t
:
support commit
.
status, --stat
u
s, a
n
d --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o
C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Matthieu Moy
lockfile: show absolute
f
ilename
i
n unable_
t
o_lock_message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Johannes Schindel
i
n
Introduc
e
<bran
c
h
>@{upstream} n
o
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Bart Trojano
w
ski
hg-to-git: fix
COMMI
T
T
ER type-o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
M
a
tthieu Moy
Be more user-friendl
y
when refusing to
do some
t
hing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Il
a
r
i Liusv
a
ara
Improv
e
e
r
ror me
s
sag
e
when a
tran
s
port
h
elper was
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Shaw
n
O
.
Pearce
remot
e
-
c
url: Fix
Accept head
e
r
for s
m
art HTTP connections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Michael Hagge
r
ty
rebase-i: Ignore comment
s
and blank lines in pee
k
_next_co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Michae
l
Hagger
t
y
lib-rebas
e
: Allow commen
t
s and blank lines
to be added
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Mic
h
ael Haggerty
lib-rebase: Provide
clearer
d
ebug
g
ing inf
o
about
w
hat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
strbuf
.
c: rem
o
ve unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next