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
reset: add test cases for "--keep" option
2010-01-20
Junio C Ha
m
ano
Me
r
ge branch 'dp/maint-1
.
6
.
5-fas
t
-import
-
non-co
m
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge br
a
nch 'j
m
/
m
a
int-
1
.
6
.
5-grep
-
NUL-terminat
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
a
mano
Teach @{upstream} syntax
t
o
strb
u
f_branchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
t150
6
: more t
e
st f
o
r @{upstream
}
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
Fi
x
"checkou
t
A
.
.
.
"
synon
y
m fo
r
"chec
k
out A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
s
t
at
u
s: don'
t
r
e
quire
t
he repository to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
ohannes Sixt
Makef
i
le:
hon
o
r N
O
_
C
URL when
s
e
t
t
ing REMOTE_CU
R
L_
*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
ident
.
c: r
e
place fprin
t
f wit
h
fputs
to sup
p
ress
comp
i
le
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
N
guyễ
n
Thái Ngọc Du
y
rm: only refresh entries that we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
vid Ripton
b
i
s
ect: fix singular/
p
lural
gr
a
mmar
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimpo
r
t: standarize sy
s
tem()
c
alls to ext
e
rn
a
l
gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Be
n
W
alto
n
cv
s
import: standari
z
e open
(
) calls to e
x
te
r
nal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
en Wal
t
on
c
v
s
i
mpo
r
t
: m
o
dernize callo
u
t
s
to git su
b
c
ommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'maint-
1
.
6
.
4' into m
a
int-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Me
r
ge branch 'ma
i
nt-1
.
6
.
3
'
into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Ha
m
a
n
o
Merg
e
br
a
nch 'm
a
int-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge commit 'v1
.
6
.
4
.
4-8-g8de6518' in
t
o
ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis-ba
c
kport of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Update draft release
notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
H
amano
U
pdate draft
r
e
l
ease no
t
es t
o
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ha
m
ano
Merge branch
'dp/maint-1
.
6
.
5-fast-
i
mp
o
rt-no
n
-
c
o
mm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merg
e
b
ranch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Me
r
ge branch
'
pc/uninteresting-submodu
l
e-disa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Merg
e
branc
h
'nd/include-term
i
o
s
-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
branch 'js/wind
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
Matthieu Moy
b
r
anch: wa
r
n
a
nd refuse to set a branc
h
as a tracking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Je
n
s Lehmann
Performance
o
ptimization for detection of modified
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liusvaara
Add b
r
anch --set-upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
A
nd
r
eas Grue
n
bacher
builtin-apply
.
c:
f
i
x the --- an
d
+++ head
e
r filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liusvaara
Add g
i
t
r
emote
s
et-url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Bark
a
lo
w
Replace
parse_blob() with
an ex
p
lan
a
t
ory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Hamano
Merge branch 'jm/main
t
-1
.
6
.
5-grep
-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
i
m Meyeri
n
g
grep:
N
UL t
e
rminate
input fro
m
a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
An
d
r
e
a
s
Gruenb
a
cher
builtin-apply
.
c
:
Skip filenames withou
t
e
nough
c
omponent
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Ham
a
no
symli
n
ks
.
c: remove unus
e
d
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
bject
.
c:
remove
u
n
u
s
e
d fu
n
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Document that merge st
r
ategi
e
s can
no
w
take their o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
P
enn
a
r
un
Exten
d
merge-
s
ubtree
tests to te
s
t -Xsubtre
e
=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Haman
o
Ma
k
e
"
subtree" part mo
r
e ort
h
ogonal
to the
r
est of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
pull: Fix pa
r
sing
o
f -X
<
option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach
g
it-pull to pass -X<option> 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
Junio C
H
amano
Up
d
ate draft r
e
lease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge branch 't
c
/test-locate-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Me
r
ge branch '
j
h/
c
om
m
it-
s
tatu
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bran
c
h 'jn/
m
akefile'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
M
e
rge branch 'jc/
m
ai
n
t-1
.
6
.
1
-
checkout-m-c
u
stom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
ama
n
o
Merge bran
c
h 'tc/clo
n
e-
v
-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Mer
g
e
b
r
anch 'tc/smart-http-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Hamano
Merge branch 'jk/run-command-use-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
Mer
g
e branch 'sr/gfi-
o
ptio
n
s'
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
git status: Show uncommitte
d
submodu
l
e chan
g
es
too
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Upda
t
e COPYING with GPLv2
w
ith new F
S
F add
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
user_ide
n
t
_s
u
ffic
i
e
n
tly_given()
:
r
efa
c
tor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
user_ident_
s
uf
f
icientl
y
_given(): re
f
act
o
r th
e
l
ogic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
r
erere: hon
o
r
conflict-marker-size attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rere
r
e: prepare for c
u
stomiza
b
le
c
o
n
flict ma
r
ker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
aman
o
com
m
it
.
c::print_
s
ummary: do not release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
H
a
m
ano
con
f
lict-
m
ark
e
r-s
i
z
e
:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
rerere: use
l
l_merge() instead of usi
n
g xdl_me
r
ge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
merge-tree
:
u
s
e ll_me
r
ge() n
o
t xdl_me
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
x
dl_merge():
a
llow passing down marker_siz
e
in x
m
pa
r
am_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Ha
m
a
n
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
Junio
C Hamano
gi
t
_a
t
t
r(): fix function
signa
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jo
h
ann
e
s Sixt
Do not use
date
.
c:tm_t
o
_time
_
t() fr
o
m compat/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej
K
.
Haczewski
MSVC
:
W
indows-native implementa
t
ion for subset of P
t
hrea
d
s
API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Merge b
r
a
nch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Haman
o
Merge branch 'cc/res
e
t
-
m
ore'
commit
|
commitdiff
|
tree
2010-01-17
Ram
k
um
a
r Ramachan
d
ra
D
ocumentation
:
Update git core tutorial cl
a
rifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Rams
a
y Jones
M
SV
C
: Fix
a
n
"incomp
a
t
i
ble poi
n
ter types" c
o
m
piler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
ohannes
Sixt
Windo
w
s: avoid the "dup dance" wh
e
n s
p
awning a ch
i
ld
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
o
hannes Sixt
Wi
n
dows: simplify t
h
e pipe(2) imple
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Si
x
t
Wind
o
ws: bo
o
st start
u
p by
avoiding a st
a
tic dependency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
E
r
i
k
Faye-Lund
W
in
d
ows: disab
l
e Py
t
h
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Teach d
i
ff that modi
f
ied subm
o
dule dire
c
tory is dirt
y
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 Lehmann
Show
s
ubmodu
l
es as mo
d
ified when they contain a dir
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ila
r
i
Liusvaa
r
a
A
d
d push --set-upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Chri
s
t
ian Couder
t7111: f
i
x bad HEAD
in tests with unmer
g
ed entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d
Agui
l
ar
diffto
o
l: Update copy
r
ight
n
otices to l
i
st
each year
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Richard Wei
n
berger
Fix unini
t
ia
l
i
z
ed variable in g
e
t_refs
_
via
_
rsync
(
)
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Tarmigan C
a
sebolt
Test t5560: Fix
t
es
t
when run w
i
th
d
a
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Nguy
ễ
n
Thái
Ngọc Duy
status: o
n
ly tou
c
h
path we ma
y
n
eed
t
o chec
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
diff
t
ool: Use
eval
t
o ex
p
and '-
-
extcmd
'
exp
r
essions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftool: Add '-x' and as an
a
lias for '--extcmd'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Aguilar
t7800-difftool
.
s
h
: Simplify t
h
e --extcmd test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --no-inde
x
: a
l
low
use of "git gre
p
"
outsi
d
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
am
a
no
grep
:
prepare to run outside
o
f a work
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ramku
m
ar Ramachandra
Document git-b
l
a
m
e triple -C option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmit
r
y Potapov
fast
-
import: tag may point to any o
b
ject typ
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
J
e
f
f King
commit: allow s
u
pp
r
ession of i
m
plici
t
id
e
ntity advic
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
commit: sh
o
w interesti
n
g id
e
n
t
info
r
mation in s
u
mmary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf: a
d
d strbuf_addbuf_per
c
e
ntquot
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
King
s
t
rbuf_expand: conve
r
t "%%" to "%"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Hag
g
erty
rebase -
i
: Retain u
s
e
r
-
edi
t
ed commit mes
s
ag
e
s af
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
icha
e
l Haggerty
t3404: Set up mor
e
of the test repo in
t
h
e
"setup"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ich
a
el H
a
ggerty
rebase -i
:
For fixup co
m
ma
n
ds without squa
s
hes, do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagg
e
rty
rebase -i: Chan
g
e func
t
ion make_squash_messa
g
e into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Micha
e
l
Haggerty
rebase -i: Extract fu
n
ction
do_wi
t
h_aut
h
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next