repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/conflict-marker-size'
2010-01-21
Jun
i
o C H
a
mano
Merge
b
ranc
h
'jc/conflict-m
a
rker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
anch 'ag/maint-app
l
y-too-
l
a
r
ge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
mano
M
e
rge branch 'a
p
/
merge-
b
acken
d
-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge br
a
nch 'nd/s
t
atus-par
t
ial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge remote branch
'
re
m
o
tes/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branch 'j
h
/notes'
(early part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio
C
Hamano
Merge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge bran
c
h 'jc/maint-refresh-in
d
ex-is-
o
pt
i
onal
-
for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'rr/
c
or
e
-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
m
ano
Merge
branch 'j
c
/
c
ache-unm
e
r
g
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
branch
'js
/
exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merge branch 'j
c
/l
s
-
files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'jc/g
r
ep-l
o
okahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge b
r
anch
'jc/mai
n
t-strbuf-
a
dd-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
mm/conflict-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Mer
g
e branch 'da/d
i
fftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch '
m
h/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Merge branc
h
'
n
s/re
b
ase-auto-squ
a
s
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'mh/rebase-fixup' (early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge bran
c
h
'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Mer
g
e
b
r
anch
'
jk/wa
r
n-author-committer
-
after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge bran
c
h
'
jc/
i
d
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
er
g
e
bran
c
h 'tr/http-push-re
f
-status'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C
Hamano
Merge
branch '
b
k/fix-relative-
g
itdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'sd/cd-p-sho
w
-top
l
evel
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
Merge branch 'j
c
/
symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c:
m
a
rk file-
l
ocal function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
S
ync with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge
b
ranch '
b
g/maint-re
m
ote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
M
erge bra
n
ch 'sb/mai
n
t-oct
o
pus' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bg/maint-add-al
l
-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
ma
n
o
Merge branch
'maint-1
.
6
.
5' into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
Me
r
ge branch 'jk/maint-1
.
6
.
5
-
reset-
h
a
rd
'
into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
M
e
rg
e
bran
c
h 'tr/maint-1
.
6
.
5-bas
h
-
prompt-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch '
d
p/main
t
-
1
.
6
.
5
-
fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'jm/maint-
1
.
6
.
5
-grep-NUL-
t
ermi
n
ate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hama
n
o
status: don't r
e
quire the repository to be
w
r
itable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
b
r
a
n
ch 'maint-1
.
6
.
3' into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
e
rge branch 'maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Mer
g
e commit 'v1
.
6
.
4
.
4-8-g
8
de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
mano
F
i
x mis-back
p
ort of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ha
m
an
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
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update
draft releas
e
notes to
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'dp/maint-1
.
6
.
5
-fast-import
-
non-c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Haman
o
Merge br
a
nch
'j
c
/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merg
e
branch
'
pc/uninte
r
esting-submodule-dis
a
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge bra
n
ch
'
n
d/includ
e
-termios
-
for
-
osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
r
an
c
h 'js/wi
n
dows
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
Merge
branch 'jm/m
a
int-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
amano
symli
n
ks
.
c: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
n
o
object
.
c
: re
m
ove unused
f
u
nction
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Do
c
ument that merge strategies can now t
a
ke their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "subtr
e
e"
part mor
e
o
r
thog
o
n
al to the
r
es
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Haman
o
pull:
F
ix par
s
ing o
f
-X<opti
o
n>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C Hamano
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 H
a
mano
Merge
b
ranch 't
c
/
test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merg
e
br
a
n
c
h 'jh/commit
-
status'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
mano
Merge branch
'jn/
m
akefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
Merge branch
'j
c
/mai
n
t-
1
.
6
.
1
-
c
heckout-m-c
u
stom-merg
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merg
e
bra
n
ch 'tc/
c
lone-
v
-progress'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
M
e
rge branch 'tc/smart-http-restric
t
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Merg
e
bra
n
ch 'jk/run-comman
d
-use-
s
hell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Up
d
ate
COPYING wi
t
h GPLv2 wi
t
h
n
ew FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficiently_
g
iven(): refactor t
h
e logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
user_i
d
e
n
t_sufficiently_given(): refactor the lo
g
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rere
r
e: hono
r
conflict-marker-s
i
ze attri
b
u
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
rerere: prepare for
customizable conflict ma
r
ker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
c
ommit
.
c
::p
r
in
t
_summary: d
o
not release the fo
r
mat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
conflict-
m
arker-size: n
e
w
a
t
tri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
rerere: us
e
ll_merge() ins
t
ead of
u
sing
x
dl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
m
e
r
ge-tree: use ll_merge(
)
not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
xdl_me
r
ge():
a
llow passin
g
down mark
e
r_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
xd
l
_merge(): introduc
e
xmparam_t for merg
e
sp
e
cific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
a
no
git_a
t
tr(): fix fun
c
tion signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
am
a
no
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
mano
Merge branch 'cc/r
e
set-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio C
Hamano
grep --no-index: allow use of "git grep
"
o
utsid
e
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Ha
m
a
n
o
gr
e
p: prepare t
o
r
u
n
outside of a work
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e br
a
n
c
h 'jc/checkout
-
m
erge-ba
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
Hamano
Merge branch 'rs
/
m
a
int-
a
rchive-match-path
s
pec'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
M
e
rge br
a
nch 'il/v
c
s-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
strbuf_addbu
f
(
)
: al
l
o
w
p
assing the s
a
me buf
t
o
d
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
amano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
t750
2
: te
s
t co
m
mit
.
sta
t
us, --status and
--no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
g
rep: rip out
pessimization t
o
u
s
e fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
g
rep: r
i
p
ou
t
s
upport fo
r
ext
e
r
n
al grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
str
b
u
f
.
c
:
remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hama
n
o
sh
a
1_
f
ile
.
c
:
re
m
ove un
u
sed f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
m
ailmap
.
c:
remove unused fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C H
a
mano
utf8
.
c: m
a
rk file-
l
ocal
fun
c
tion static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
submo
d
ule
.
c
: mark f
i
le-
l
ocal fun
c
ti
o
n sta
t
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
quote
.
c
: ma
r
k file-local
functi
o
n sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next