repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ag/patch-header-verify'
2010-01-21
Junio C Hamano
Merge bra
n
ch 'ag/pa
t
ch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o
C Hamano
M
e
r
g
e bra
n
ch '
j
c/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branch 'ag/maint-a
p
p
ly-too-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
M
erge
branch
'a
p
/merge-backend-opt
s
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Me
r
ge
b
ranc
h
'nd/sta
t
us-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge remote branch 'remotes/
t
rast
-
doc
/
for-next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ham
a
no
M
e
r
ge bra
n
ch 'jh/
n
otes' (ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Hamano
Merge branch 'jc/maint-
r
e
fresh-index-is-opti
o
nal-f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
branch 'rr/core-tut
o
rial'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
M
erge branch 'jc/c
a
che-
u
nmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
er
g
e
b
r
a
n
ch 'js/exec-er
r
or-repo
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
erge bra
n
ch
'jc/ls-files
-
ignored-p
a
th
s
pec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
m
a
no
Merg
e
b
r
anch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merge branch 'jc/ma
i
n
t-st
r
bu
f
-
a
d
d-fix-
d
oubl
i
n
g
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
erge branch
'
mm
/
con
f
lict-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Ham
a
no
Mer
g
e branch
'
m
h
/re
b
ase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'ns/rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Me
r
g
e branch 'm
h
/rebase-fixu
p
' (e
a
r
ly
p
a
r
t)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge b
r
a
nch 'jk/warn-
a
uth
o
r-com
m
itter-after-co
m
mit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
e
rg
e
b
ranc
h
'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'tr/http-pus
h
-ref
-
stat
u
s'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
rge branch 'bk/
f
ix-r
e
lative-git
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
a
no
Merge branch 'sd/cd-p-show-tople
v
el'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C H
a
mano
Merge bra
n
ch 'jc/symbol-stati
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
da
t
e
.
c: mark
f
ile-local function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
S
y
n
c
w
ith
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
Jun
i
o C H
a
mano
Merg
e
bra
n
ch 'bg
/
maint-remote
-
update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
amano
Merge
b
ran
c
h
'sb/m
a
int
-
octop
u
s'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C H
a
m
an
o
Merge branch 'bg/maint-a
d
d-al
l
-doc'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
r
g
e branc
h
'maint-1
.
6
.
5
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Git
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
a
mano
Merge br
a
nch 'jk/maint-1
.
6
.
5-re
s
e
t-h
a
rd' into
main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge b
r
anch 'tr/ma
i
n
t
-1
.
6
.
5-b
a
s
h-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Merge bra
n
ch
'
dp/mai
n
t-1
.
6
.
5-fa
s
t-im
p
ort-non-commi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e branc
h
'jm/maint
-
1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
s
t
a
tus: don't
r
e
quire the repository t
o
be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge branch
'maint-1
.
6
.
4' i
n
to main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C Hamano
Merge branch
'
maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Me
r
ge branch 'm
a
int-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Hamano
Merge commit 'v
1
.
6
.
4
.
4-8-
g
8de6518
'
into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
F
i
x
mis-b
a
ckport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
U
pdate dra
f
t release
n
otes 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
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Hamano
Update dr
a
ft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch 'dp/maint-1
.
6
.
5-fast-import-non-co
m
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
M
e
rge branch 'pc/
u
ninteresting-submodule-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge branch 'nd/include-t
e
rmios-f
o
r
-
osol
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'
js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
Merge
bran
c
h 'jm/maint-1
.
6
.
5-gr
e
p-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c:
remove unu
s
ed functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
ano
object
.
c
:
remov
e
un
u
se
d
fun
c
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Document that merge strateg
i
es c
a
n now t
a
ke th
e
ir
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
aman
o
Make "subtree" p
a
rt more ortho
g
o
nal to
the r
e
s
t of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
n
o
pull:
F
ix parsing of -X<option
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Haman
o
Update dr
a
ft release notes
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erge
b
ra
n
ch 't
c
/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erge branch 'jh/commit-st
a
tus'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge
branch 'jn/make
f
ile
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch 'jc/maint-1
.
6
.
1-che
c
k
out-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branch 'tc/clone-v-p
r
ogres
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge
b
ranch 'tc/smart-htt
p
-
r
e
s
t
r
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch
'jk/r
u
n-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'sr
/
gfi-
o
p
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
Updat
e
COPYING with GPLv2 with new FSF addr
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
use
r
_iden
t
_suffici
e
ntly_
g
iven(): refac
t
or the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
user_ide
n
t_sufficien
t
ly_give
n
(): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor conf
l
i
c
t-marker-size
a
ttribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C
H
am
a
no
rerere: prepare for
customizable conflict ma
r
ker leng
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
comm
i
t
.
c::p
r
int_sum
m
ary
:
do not
r
ele
a
se the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflic
t
-marke
r
-size:
new attr
i
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io
C
Ha
m
a
no
r
e
r
e
r
e: use ll_merge()
instead of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
merge-tree:
u
se ll_m
e
rge()
n
ot xd
l
_
m
e
r
g
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
xdl_merge(
)
: allow pass
i
ng down marker_siz
e
in xmp
a
ram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merg
e
():
i
ntroduce xmpar
a
m_t
for mer
g
e specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
git_attr(): fix funct
i
on signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
n
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C Haman
o
Merge branch
'
c
c
/reset
-
more
'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --no-index: allow use
o
f
"git grep" o
u
tside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep
:
prepare to run outside of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C
Hamano
M
e
r
ge bran
c
h
'jc/checkout
-
merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
Merge
b
ranch 'rs/maint-archi
v
e-match-pa
t
hspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
mano
Merge branch 'il/vcs
-
h
elper'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
strbuf_addbuf():
allow passing the
s
a
me b
u
f to
dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
aman
o
Merge
b
ranch 'cc/res
e
t-more
'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Mer
g
e
bra
n
ch 'nd/spar
s
e
'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Ha
m
ano
t7502: test commit
.
status,
-
-stat
u
s and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
grep: ri
p
out pessimization
to
u
se fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o C Hamano
g
r
ep
:
rip
o
ut sup
p
ort for external g
r
ep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
strbu
f
.
c: rem
o
ve
u
nused func
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C
H
a
m
a
no
sha1_fi
l
e
.
c
: remove unused func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
mailmap
.
c: r
e
m
o
ve u
n
used function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
u
t
f
8
.
c:
m
ar
k
file-local fun
c
tion st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
subm
o
d
u
l
e
.
c:
mark fi
l
e
-
local
f
unct
i
on s
t
atic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next