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
S
ixt
M
a
k
e 'rere
r
e f
o
rget' work
f
r
om a s
u
bdirector
y
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jo
h
annes
Sixt
Make test
case numbers unique
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Ha
m
ano
c
o
nflict-marker-size: add te
s
t and doc
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Up
d
a
t
e dra
f
t re
l
ease n
o
t
es to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
H
amano
M
erge
b
ranch
'
b
w
/
cvsimpor
t
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C Ham
a
no
Merge branc
h
'
j
c/
c
heckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge branch
'ag
/
patc
h
-head
e
r-verify
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
ran
c
h 'jc/conflict-marker-s
i
ze'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
M
erge br
a
nch 'ag/
m
aint-apply
-
too-larg
e
-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'ap/merge-
b
ackend-o
p
t
s
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e bran
c
h 'nd/sta
t
us-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
M
e
rge r
e
mote branch 'remotes/tra
s
t-
d
oc/fo
r
-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge br
a
nc
h
'jh
/
notes
'
(
earl
y
pa
r
t)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch 'jc/mai
n
t-refresh-index-is-
o
pti
o
nal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
g
e
branch
'
rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'jc/cache-unmerg
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
b
ranch
'j
s
/e
x
ec-error-repor
t
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge branch 'jc/
l
s
-
f
i
l
es-ig
n
ored-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e b
r
anch 'jc/grep-looka
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
Merge branch 'jc/ma
i
nt-strbuf-add-f
i
x
-d
o
u
b
ling'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Me
r
ge branch 'mm/co
n
flict-advice
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge b
r
a
nch '
d
a/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge
b
r
a
nch
'
mh/rebase-fi
x
up'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
ma
n
o
Merge branch 'ns/re
b
ase-a
u
to-
s
quas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branc
h
'mh/rebase-fixup' (ea
r
ly
p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge bran
c
h 'il/pu
s
h-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'jk/warn-autho
r
-committer-a
f
ter
-
commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge branch 'jc
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge br
a
nch
'tr/h
t
tp-pu
s
h-ref-
s
tat
u
s'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'bk/fix-re
l
ativ
e
-
gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Merg
e
branch 's
d
/cd-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C
Haman
o
M
e
r
ge branch 'j
c
/
symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
dat
e
.
c: mark file-local
f
uncti
o
n
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io 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 Hamano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hamano
M
erge branch 'bg/maint-remote-update-default'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'sb/maint-octopus' into
m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'bg/maint-add-
a
l
l
-doc' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Merg
e
branch 'mai
n
t
-
1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
G
it 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge bran
c
h 'jk/maint-1
.
6
.
5-reset-hard'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
Merge branch 't
r
/
m
aint-1
.
6
.
5-bash-
p
rompt-sho
w
-submod
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge br
a
n
c
h 'd
p
/maint-1
.
6
.
5-fast-import-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge b
r
a
nch 'jm/ma
i
nt-1
.
6
.
5-grep-
N
UL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "checko
u
t A
.
.
.
" synonym for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
s
tatus: don't require the repository to be wr
i
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
ohannes
S
i
x
t
Makefile: honor N
O
_CURL when setting REMOTE_CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ta
r
mi
g
an Casebolt
ident
.
c
:
replace fprin
t
f
w
ith fp
u
t
s
t
o
suppress compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ng
u
yễn Thái
Ngọc Duy
rm: o
n
ly refresh entrie
s
that we may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Rip
t
on
b
is
e
c
t: fix singular/pl
u
r
a
l
g
rammar nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: standarize system() cal
l
s to exte
r
nal g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n
Walton
cvs
i
mpor
t
: standariz
e
open() calls
t
o
external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben
Walton
cvsimpo
r
t: modernize callouts to git
subco
m
m
a
nds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merg
e
b
ranch 'maint-1
.
6
.
4
' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ha
m
ano
Merg
e
branch 'maint-1
.
6
.
3' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
2' into maint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge
c
om
m
i
t 'v1
.
6
.
4
.
4-8-
g
8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Fix
mis
-
backport of
t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
ama
n
o
Update dr
a
ft
release no
t
es to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Up
d
a
t
e
dr
a
ft
release note
s
to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'dp/maint-1
.
6
.
5-f
a
st-impor
t
-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
erge bra
n
ch 'j
c
/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Ham
a
no
M
erge branch '
p
c/uninterestin
g
-submodule-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Me
r
ge b
r
anch 'nd/i
n
clude-termio
s
-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Mer
g
e branch 'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
And
r
e
as Gru
e
n
bacher
builtin-appl
y
.
c: fix the --- and +++
header filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Dani
e
l
Ba
r
k
a
l
o
w
Repl
a
ce
pa
r
s
e_blob() wit
h
an expla
n
a
t
ory comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Mer
g
e branch 'jm/maint-1
.
6
.
5-grep-
N
U
L-
t
ermi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
grep
:
N
UL t
e
rminate input from a fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
n
drea
s
Gru
e
nbacher
b
uiltin-apply
.
c: S
k
i
p
fi
l
enames without enou
g
h components
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c:
remove un
u
s
e
d
functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
ob
j
ect
.
c: re
m
o
ve unused
f
unct
i
on
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Docu
m
e
n
t
that mer
g
e st
r
ategies can now take the
i
r
ow
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Ex
t
end merge-su
b
tree tests
t
o t
e
st -Xsubtree=
d
i
r
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Make
"
subtree
"
part m
o
re orthogonal to t
h
e
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix parsin
g
o
f -X
<
optio
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teac
h
g
it-pul
l
t
o
pass -X<option> to git-
m
e
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
g
i
t me
r
ge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update
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 Ha
m
ano
Merge branch
'
tc/test-
l
ocate-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Merge bran
c
h 'jh/commit-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Ham
a
no
Merg
e
branch 'jn/
m
a
kefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'jc/maint-1
.
6
.
1
-
checkout-m-
c
ustom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
ano
Merge branch
'tc/clone-v-progre
s
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Ham
a
no
Merge
b
ranch
'tc/s
m
a
r
t-http-re
s
t
ri
c
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
r
ge
br
a
nch 'jk/run-command-use-shell
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
an
o
Update C
O
PY
I
N
G
wi
t
h
G
P
L
v
2 with new F
S
F address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
user_ident_suffi
c
iently_given():
refa
c
t
or the
l
og
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_s
u
ffici
e
n
t
l
y_gi
v
en(
)
:
r
ef
a
ctor the l
o
gic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
rerere: honor conflict-ma
r
k
e
r-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
r
erer
e
: prep
a
re for
c
u
stomizable co
n
flict ma
r
ker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
c
omm
i
t
.
c::print_summ
a
r
y
: d
o
not releas
e
the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
confli
c
t-
m
arker-size
:
new attrib
u
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
r
e
rere: use ll_merge() instead
o
f using xdl_me
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
merge-tree
:
use ll_mer
g
e()
n
ot
xd
l
_
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge():
a
llow
passing down
m
arke
r
_size
in
xm
p
a
r
am_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next