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
Johannes Sixt
Mak
e
'rerere forget' work from a subdirectory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Sixt
Mak
e
test
case numbers u
n
ique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
c
o
n
flict
-
marker-size: add test an
d
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C H
a
m
ano
Update draft rel
e
ase n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch 'bw/cvsimp
o
rt'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
amano
Merge b
r
a
n
ch 'jc/checkout-merge-b
a
se'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
a
mano
Merge b
r
anch 'ag/pa
t
ch-hea
d
e
r-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
anch 'jc/c
o
nflict-
m
a
rker-s
i
z
e
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge
branch
'ag/maint-a
p
ply
-
t
oo-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge
b
ranch
'
ap/merge-b
a
ckend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hama
n
o
Merge branch 'nd/status-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Ha
m
ano
M
erge rem
o
t
e
b
ran
c
h 'remote
s
/trast-d
o
c
/
for-next
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Me
r
ge br
a
n
ch
'
jh/notes' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch 'jc/main
t
-refresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge branch 'rr/core-
t
utorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge bra
n
ch 'jc
/
cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
H
amano
Me
r
ge
b
ranch
'js/exec
-
error-report'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
r
ge
branch 'jc/ls-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
n
o
Merge branch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'jc/maint-strbuf-add-fix-doublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
Merge b
r
anch 'mm/con
f
l
i
ct-advice'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'da/di
f
ftool'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge
branch 'mh/r
e
base-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
Me
r
ge br
a
nch 'ns/
r
e
b
a
se-
a
uto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Mer
g
e branc
h
'
m
h/rebase-f
i
xup' (ear
l
y
par
t
)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
M
erge branch 'il/push-set
-
ups
t
rea
m
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'
j
k/warn-author-comm
i
tter-af
t
er-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
no
Merg
e
branch
'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge br
a
nch 'tr
/
htt
p
-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
ano
M
erge branch 'bk/fix-relativ
e
-gi
t
dir-file'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
m
an
o
Merge branch 'sd/cd
-
p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
man
o
Me
r
ge b
r
anc
h
'
j
c
/s
y
mbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mark
f
ile-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
S
ync
w
i
t
h 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Git
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'bg/ma
i
n
t
-remot
e
-update-defa
u
l
t' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
M
e
rge branch 'sb/maint-o
c
top
u
s' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
ge branch 'bg/ma
i
nt-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge br
a
nch 'ma
i
nt-1
.
6
.
5' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
G
it 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
no
Merge branch
'
jk/maint-
1
.
6
.
5-rese
t
-
h
ard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'tr/m
a
int-1
.
6
.
5-bash-p
r
ompt
-
sho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Merge branch 'dp/maint-1
.
6
.
5-fast-impo
r
t
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hama
n
o
M
e
rge branc
h
'jm/maint-1
.
6
.
5-grep-NUL-te
r
mi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Fi
x
"chec
k
o
u
t A
.
.
.
" synonym for "chec
k
o
ut
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
st
a
tus: don't require the r
e
positor
y
to
be
wri
t
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
e
rge
b
ranch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Ma
k
e
file: honor NO_CURL when setting REMOTE_CU
R
L_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tar
m
i
g
a
n
Casebolt
ident
.
c: replace fprintf with fputs to s
u
ppress com
p
iler
.
.
.
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 entr
i
e
s
that we may tou
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Da
v
id Ripton
bisect: fix sin
g
ular/plur
a
l
gr
a
mmar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
alton
cvsimport: sta
n
darize sy
s
tem() calls to external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
import
:
standarize
o
pen
(
) call
s
to external
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
Walton
c
vsimp
o
rt
:
mo
d
erni
z
e callouts to git subcommands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge
branch 'maint-1
.
6
.
4
'
i
nto maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
Merge branch 'main
t
-
1
.
6
.
3' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Me
r
ge branch 'maint-1
.
6
.
2' into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8-g8d
e
6518'
i
nto mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
amano
F
i
x
mis-backport
o
f t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Update dra
f
t release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Haman
o
M
er
g
e bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Upd
a
te d
r
a
f
t release notes t
o
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
branch
'
d
p
/ma
i
nt-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Merge branch 'jc/rerer
e
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'pc/uninter
e
st
i
ng-submodule
-
disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Ha
m
ano
Merge branch 'nd/inc
l
u
d
e-t
e
rmios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch 'j
s
/windows'
commit
|
commitdiff
|
tree
2010-01-19
A
n
dreas Gr
u
enbacher
buil
t
in-apply
.
c: fix the --- and +++
h
e
a
der
fil
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Danie
l
Bar
k
a
l
o
w
Replace parse_blob()
with an explanatory
c
o
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
no
M
e
rge b
r
anch
'jm/mai
n
t-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
i
m Meyering
g
rep: NUL termi
n
ate i
n
put f
r
om a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andrea
s
Gruen
b
acher
builti
n
-app
l
y
.
c: Skip filenames without e
n
ough co
m
po
n
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
man
o
symlin
k
s
.
c: r
e
m
o
v
e
unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
bject
.
c: remove unused f
u
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Document that merge strateg
i
es can now take thei
r
own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Extend
m
erge-subtree tests to test -X
s
ubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Ha
m
a
n
o
Make "sub
t
re
e
" pa
r
t more orthogonal to
the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C
Haman
o
pull:
Fi
x
parsing o
f
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pe
n
n
a
run
Te
a
ch g
i
t-pull to pas
s
-X<
o
ption> to git
-
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
Penn
a
run
git
m
erge
-X
<
option
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
H
a
mano
Update draft
r
elease
n
otes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
a
m
ano
Merge bran
c
h '
t
c/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch
'
jh/co
m
m
i
t-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merg
e
br
a
nc
h
'j
n
/ma
k
efil
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-
1
.
6
.
1-check
o
u
t
-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Hamano
Mer
g
e
b
r
a
nch 'tc/cl
o
ne-
v
-progress'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Merge bran
c
h
'tc/smart-http-rest
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch 'j
k
/run-command
-
use-she
l
l'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge br
a
nc
h
'
sr/gf
i
-op
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
Update COPYING with GP
L
v
2 with ne
w
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hama
n
o
user_i
d
e
nt
_
s
uf
f
iciently
_
given(): re
f
a
ctor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
user_iden
t
_su
f
ficien
t
ly_given
(
)
: refactor
t
h
e
l
ogic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
rer
e
r
e: honor confl
i
ct-marker-size
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re: prepare for
c
ustomizable conflict ma
r
ker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::p
r
i
nt_s
u
mmary
:
d
o
n
ot release
t
he for
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
c
o
nflict-marker-size: new attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C H
a
mano
rerere: us
e
ll_me
r
ge() inst
e
a
d
of usi
n
g
x
d
l_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
merge-tree: use ll_merge()
n
ot xdl_m
e
rge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge():
a
llow passing
d
own m
a
rker_size i
n
xmpara
m
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next