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 'rerere forget' work from a subdirectory.
2010-01-21
J
oha
n
nes Sixt
M
a
ke 'r
e
rere forg
e
t' work from a su
b
di
r
ect
o
r
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johanne
s
S
ixt
M
a
k
e
test cas
e
nu
m
bers
u
nique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
amano
conflic
t
-marker-size
:
add tes
t
and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
n
o
Update
dr
a
ft rele
a
se notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge
b
ranch 'bw/c
v
simpo
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
n
o
Merge branch
'jc/checkout-merge-bas
e
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge bran
c
h '
a
g/patch-h
e
ader-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branch 'j
c
/conflict-marker
-
size'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge branc
h
'ag/mai
n
t-apply-too-l
a
rge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branc
h
'ap/me
r
ge-backen
d
-opts'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge bran
c
h '
n
d
/status
-
partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
man
o
Merge r
e
mote br
a
nch 'r
e
motes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge
br
a
n
ch 'jh/
n
ot
e
s
' (
e
ar
l
y part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Ham
a
no
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ham
a
no
Merg
e
branc
h
'jc/maint-refres
h
-index-is-optiona
l
-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
bran
c
h 'rr/c
o
re-tutori
a
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
erge br
a
nch 'jc/
c
ac
h
e-u
n
merg
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'js/exec-e
r
ror-repo
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
Merge branch 'jc/ls-files-ignore
d
-
p
athsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merg
e
branch 'jc/grep-lo
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Ham
a
no
Merge branch
'
jc/maint-strbuf-a
d
d-fix-doub
l
ing'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'mm
/
c
o
nflict-a
d
vice'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Ham
a
n
o
Merg
e
branch
'
da/diffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
r
ge branch 'm
h
/reb
a
se-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merg
e
branc
h
'
n
s/rebase-auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Ha
m
ano
Merg
e
br
a
nch 'mh/rebase-fix
u
p' (
e
arly pa
r
t
)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge
branch
'
il/pu
s
h-set-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge b
r
anch 'jk/warn-auth
o
r
-committer-afte
r
-com
m
it'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch
'tr/http-push-ref-s
t
atus'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
e
rge branch 'b
k
/fix-
r
elative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Mer
g
e br
a
nch 'sd/cd-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge bran
c
h 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C
H
amano
date
.
c: mark
f
ile-lo
c
al
f
unction
st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge b
r
anch 'bg/maint-remote-update
-
d
efault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
sb/maint
-
octopus' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
Merge bra
n
ch 'b
g
/maint-add
-
all-doc' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge bra
n
ch 'jk/maint-1
.
6
.
5-res
e
t-hard'
i
nto m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
b
ra
n
ch 'tr/maint-1
.
6
.
5
-
bash-prompt-s
h
o
w-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge br
a
n
c
h 'dp/maint-1
.
6
.
5-
f
ast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'jm/
m
aint-1
.
6
.
5-grep-NUL-terminate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io
C
Hamano
F
i
x "checko
u
t
A
.
.
.
" syn
o
nym fo
r
"chec
k
out A
.
.
.
HE
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C H
a
mano
status:
d
on'
t
r
equire th
e
repository to be writabl
e
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
Johannes S
i
xt
Makefile: honor NO_CURL when
s
etting REMOTE
_
CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarm
i
gan Casebolt
ide
n
t
.
c: replace fp
r
in
t
f with fputs to sup
p
ress compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái Ngọc Duy
rm: on
l
y r
e
fre
s
h
e
ntries tha
t
we may
touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David
R
i
pton
bisect
:
f
ix
s
ingular/plur
a
l gr
a
m
m
ar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport:
s
tandarize
s
y
s
te
m
() calls to external
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n Wa
l
ton
c
v
simport: s
t
and
a
r
iz
e
open
(
) calls to external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport
:
modernize
c
al
l
o
u
t
s
t
o git subcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Haman
o
Merge branch 'maint-1
.
6
.
4'
i
n
t
o maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
Hamano
Merge branch 'maint-
1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Me
r
ge branch
'm
a
int-1
.
6
.
2'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
e
rge commit 'v1
.
6
.
4
.
4
-8-g8
d
e6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix mis
-
backport
o
f
t
7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Updat
e
draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
H
amano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C H
a
man
o
Update draft release notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch 'dp
/
m
a
int-1
.
6
.
5-fast-
i
mpor
t
-
n
on-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Haman
o
M
e
rge bran
c
h 'jc/rere
r
e'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge b
r
anch
'
pc/unintere
s
ting-
s
ubmodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C H
a
mano
M
e
rge branc
h
'
n
d
/include
-
termios-
f
or-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ha
m
ano
Merge branch 'js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
And
r
eas Gru
e
nbacher
built
i
n-ap
p
ly
.
c
: fix the --- and +++ header fi
l
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
niel Barkalow
Replace parse_blob()
with an
ex
p
l
anato
r
y comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch '
j
m/
m
aint-1
.
6
.
5-grep-NUL-
t
ermin
a
t
e
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meye
r
i
n
g
g
r
ep: N
U
L terminate
i
nput fr
o
m
a
fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Grue
n
b
a
cher
builtin-apply
.
c: Skip filenames wi
t
h
out enoug
h
c
o
mponents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
syml
i
nks
.
c
: remov
e
unuse
d
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
object
.
c: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
ano
Doc
u
ment th
a
t
merge strate
g
i
e
s
can
n
o
w take thei
r
o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Av
e
ry Pennarun
Extend merge-su
b
tree tests to t
e
st -Xsubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
Make "subtree" part more orthog
o
nal to
t
he
r
est of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C
H
amano
p
ull: Fix
p
a
rs
i
ng of -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Penna
r
un
Te
a
c
h
git-
p
ull
to pass -X<o
p
tion>
to git-merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
ennar
u
n
g
i
t merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
U
pd
a
te draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge branc
h
't
c
/test-locate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Merge branch 'jh
/
commit-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
M
e
rge b
r
an
c
h
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hama
n
o
Merge
b
ranch 'jc/maint-1
.
6
.
1
-
checkout-m-cu
s
tom-mer
g
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
e
rge
branch '
t
c
/clon
e
-v
-
pro
g
ress'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
mano
Merge bran
c
h 'tc
/
sm
a
rt
-
h
ttp-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
er
g
e
b
r
anch 'jk/run
-
command-
u
s
e
-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
Merge branch 'sr/g
f
i-options'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
Upda
t
e C
O
PYING with GPLv
2
w
ith
n
ew F
S
F
address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
user_
i
de
n
t
_
s
u
fficiently_g
i
ven(
)
: refactor th
e
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
ma
n
o
u
s
er_id
e
nt_sufficientl
y
_given(): ref
a
ctor
t
he logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
re
r
ere: honor c
o
nf
l
ict-marker-size at
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
rerere:
p
repa
r
e for
c
ustomiz
a
bl
e
conflict marker
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
c
o
mmit
.
c::print_summary: do
not r
e
l
ease the
form
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
conflict-marker-size:
new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
rerere:
u
s
e ll_merge
(
) i
n
stead o
f
u
sing xdl_
m
er
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tr
e
e: use ll_mer
g
e(
)
not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
xdl_merge(): all
o
w pas
s
ing down marker_size in xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next