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
Make test case numbers unique
2010-01-21
Johan
n
es Sixt
Make test case numbers unique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
c
o
n
f
lict-marker-siz
e
:
add t
e
st and
d
oc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update draft release note
s
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Haman
o
Merge bran
c
h 'jc/checko
u
t
-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
bra
n
ch 'ag/patch-
h
ea
d
er-veri
f
y'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Mer
g
e
bran
c
h 'jc
/
co
n
flict-marker-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'ag/maint
-
apply-too-
l
arge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Mer
g
e branch 'ap/merge-
b
ackend-
o
pts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'nd/status-par
t
ial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Haman
o
M
e
rg
e
remote branch
'rem
o
t
e
s/tras
t
-doc/fo
r
-n
e
xt'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
M
erge
branch 'jh/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C
Hamano
Merge branch 'jc/maint-refresh-
i
n
d
ex-is-optional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
e
rge
bran
c
h 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/cache-unmer
g
e'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Mer
g
e branch
'
js/exec-error-re
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Merge branch 'jc/
l
s
-
f
iles
-
ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge bra
n
ch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'jc/maint-s
t
rbuf-add-
f
ix-doublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'mm/confli
c
t-advi
c
e'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hama
n
o
M
erge
branc
h
'da/difftool
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'mh/r
e
base-fixu
p
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
n
o
Me
r
ge branch 'n
s
/rebase-auto
-
s
q
uash'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
an
o
M
e
rge branch '
m
h
/
re
b
a
s
e-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'il/push
-
set-upst
r
ea
m
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'jk/warn
-
aut
h
or-com
m
itter-after-comm
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e
b
ranch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge br
a
nc
h
'
t
r
/ht
t
p-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bk
/
fix-r
e
lative-gitdir-fi
l
e'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge branch
'
s
d
/cd-p
-
sho
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
m
an
o
Mer
g
e branch 'jc/symbol-s
t
atic'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Hamano
date
.
c: mark file-lo
c
al fun
c
tion static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Syn
c
with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
H
a
mano
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch
'
bg/maint-remote-update-de
f
aul
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'sb/maint-octopus'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
a
nch 'bg/ma
i
nt-add-all-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
b
r
anch 'maint-1
.
6
.
5
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'jk/ma
i
nt-1
.
6
.
5-reset-hard' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'tr/ma
i
nt-1
.
6
.
5-bash-
p
r
om
p
t-show
-
submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
Merge
b
ranc
h
'
d
p/main
t
-1
.
6
.
5-fas
t
-
i
mport
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
ama
n
o
Mer
g
e b
r
an
c
h '
j
m/
m
aint-1
.
6
.
5-
g
rep
-
NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Fix "ch
e
ckout
A
.
.
.
" synonym for "che
c
kout A
.
.
.
H
EA
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
stat
u
s:
don't
r
e
q
ui
r
e
the
r
epository to be
w
ritable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Johannes
Sixt
Makefile:
honor NO_CUR
L
w
h
en setting
REMOTE_CURL_
*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tar
m
igan Casebolt
ident
.
c: replace fprintf with
f
puts to
s
uppress compi
l
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái
N
gọc Duy
rm: only refresh ent
r
ies that we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisect: fix singul
a
r/plural
gram
m
ar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
a
l
ton
cvsimport: standarize system() calls t
o
ext
e
rnal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Wal
t
on
c
vsimport
:
standarize open() calls to external
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: moder
n
ize call
o
uts to git subcommand
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
a
mano
Merge branch 'main
t
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch 'maint-1
.
6
.
3' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Mer
g
e branch 'ma
i
nt-1
.
6
.
2
' into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
c
om
m
it 'v1
.
6
.
4
.
4-8-g8d
e
6518' into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
Fix mis
-
backport
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C H
a
mano
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Upd
a
te dr
a
ft re
l
ease
notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge bra
n
ch 'dp/
m
aint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge bra
n
ch 'jc/r
e
rere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
Merge branc
h
'pc/
u
nint
e
resting-submodul
e
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'nd/include-termios
-
for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge br
a
n
ch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenbache
r
b
u
iltin-a
p
ply
.
c: fix the --
-
and
+
+
+ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Danie
l
Ba
r
kalow
Replace
parse_blob()
w
ith an explanatory comme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Me
r
g
e
branch '
j
m
/
maint-1
.
6
.
5-gre
p
-NUL-
t
erminate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
g
r
e
p: NUL terminate input fr
o
m a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
ndreas Gruenbach
e
r
b
uiltin-ap
p
ly
.
c:
S
ki
p
filenam
e
s without enough compo
n
ent
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C Hamano
symlink
s
.
c: remo
v
e un
u
sed
f
uncti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
o
b
ject
.
c:
remove u
n
used functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
Document
t
h
at merge
strategie
s
can now take their
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Pennarun
Extend merge-sub
t
ree test
s
to test -Xsu
b
tree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Ma
k
e "subtree" part more orthogonal to
t
he rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix par
s
ing of -
X
<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pe
n
narun
T
e
a
ch git-pull to p
a
ss -X<optio
n
> to git-m
e
r
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
git merge -X<op
t
ion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Haman
o
Update draft release notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Merge branch 'tc/te
s
t-
l
ocate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C
Hamano
M
erge branch 'jh/commit-
s
t
a
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branch
'
jn/makefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
Me
r
ge branch 'jc/
m
aint-1
.
6
.
1-checkout-m-c
u
stom-mer
g
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
no
Me
r
ge branch 'tc/clone-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C
Hamano
Merge
branc
h
'tc/sma
r
t-h
t
tp-r
e
s
tri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch '
j
k/run-c
o
mmand-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ha
m
ano
Merge branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Updat
e
C
OPYING
w
it
h
GPL
v
2
w
ith
n
ew FSF
address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_
i
dent_
s
uffi
c
ie
n
tly_given(): refactor
t
he
l
o
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
u
s
er_ident_sufficiently_g
i
ven
(
): ref
a
ctor the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rerer
e
:
h
onor confli
c
t
-mar
k
e
r
-
siz
e
at
t
r
ibute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
rere
r
e:
p
repare fo
r
customizable conflict mark
e
r
leng
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
commit
.
c
:
:p
r
i
nt_
s
ummary:
d
o n
o
t r
e
lease
t
he fo
r
m
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
conf
l
ict-marker
-
s
i
z
e
: n
e
w attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
ama
n
o
rerere:
use l
l
_m
e
rge() instead o
f
using x
d
l_merg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
merg
e
-tree: use ll_
m
erge()
not x
d
l_mer
g
e(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(): al
l
ow passing
d
ow
n
marker_size
i
n xmp
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
H
amano
xdl_merge(): introduce xmparam_t for merge specifi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next