repo.or.cz
/
git
/
jrn.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
Junio C
H
a
ma
n
o
Merge bra
n
ch 'jc/conflict-ma
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C
Hamano
M
erge branch 'ag/maint-apply-too-large
-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ha
m
a
n
o
Merge
b
ranc
h
'ap/merge-b
a
ck
e
n
d-opts
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge branch 'nd/status-partia
l
-
r
efres
h
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o C Hamano
M
erge remote branch 'remotes/trast-do
c
/
f
or-next'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Me
r
g
e
branch 'jh/not
e
s' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
a
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branc
h
'jc/maint-refresh-index-
i
s-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Merge branch 'rr/c
o
re-tutori
a
l
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ham
a
no
Merge
branch '
j
c/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge branch 'j
s
/ex
e
c
-
error-repor
t
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge bra
n
ch 'jc/ls-files-ignore
d
-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge bran
c
h 'jc/g
r
ep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge bran
c
h 'jc
/
maint-strbuf-add-fix-d
o
u
bl
i
ng'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
H
amano
Me
r
ge branch 'mm/conf
l
ict-adv
i
c
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'da
/
di
f
ftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh
/
rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
erge branch 'ns/rebase-auto-
s
quash'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Haman
o
M
erg
e
b
r
a
n
c
h 'mh/reb
a
se-f
i
xup' (ear
l
y part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
M
erge branch 'il/
p
ush-
s
et-upstr
e
am'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Mer
g
e
branch 'jk
/
w
a
rn-author-committer-
a
fte
r
-
commit'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
amano
Merge
br
a
nch '
t
r
/
http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
erge branch 'bk/fix-relativ
e
-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Haman
o
Merge branch
'
s
d/cd-p-sh
o
w-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Mer
g
e branch 'jc
/
symbol-stat
i
c'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C
Hamano
date
.
c: mark file-local function stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Sy
n
c wit
h
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
M
e
rge branch 'bg/mai
n
t-remote-update-defau
l
t' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge
b
ranch
'sb
/
maint-octopus'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge b
r
anch
'
b
g
/maint-
a
dd-all-doc'
i
n
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
branch
'maint-
1
.
6
.
5
' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'jk/maint-1
.
6
.
5
-reset-hard'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branc
h
'tr/maint-1
.
6
.
5-bash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch '
d
p/maint-1
.
6
.
5
-
f
a
st-import-n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
g
e
branch 'jm/maint-1
.
6
.
5-grep-NUL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Ham
a
no
stat
u
s: don't
r
e
quire the
r
epositor
y
to be
writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
e
rge b
r
anch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: hono
r
NO_CURL whe
n
setting REMOTE_CURL_
*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarm
i
gan C
a
s
e
bolt
ident
.
c: replace fpri
n
t
f
w
ith
f
puts to su
p
press compiler
.
.
.
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
entrie
s
th
a
t we
may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David
Ri
p
t
o
n
bisect:
f
ix singular/plu
r
al grammar n
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'm
a
int
-
1
.
6
.
4
'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
ama
n
o
Merge branch 'main
t
-1
.
6
.
3'
i
n
to m
a
i
n
t
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
M
e
rge branch 'm
a
int-1
.
6
.
2
'
into
m
a
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
commi
t
'v1
.
6
.
4
.
4-8-g8de6518' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Fix mis-b
a
ckport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Update draft rele
a
se no
t
es to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Upd
a
te draft r
e
l
ease no
t
es
to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch '
d
p/main
t
-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'pc/un
i
nteresting-submod
u
l
e
-
disa
p
pea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
a
man
o
Merge
b
ranch 'nd/include
-
termios-fo
r
-o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
no
Me
r
ge branch
'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Replace pa
r
se_bl
o
b() with an explanato
r
y com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Mer
g
e branch 'jm/ma
i
nt-1
.
6
.
5-grep-NUL-te
r
minate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyerin
g
gr
e
p: NUL termi
n
ate in
p
ut from a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenbacher
builtin-a
p
ply
.
c: Skip file
n
a
mes
w
ith
o
ut enough
c
omponents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Ham
a
no
symlinks
.
c: rem
o
ve
u
nused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
o
b
ject
.
c:
r
emove unused fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that
m
erge s
t
rategies can
n
ow
take
t
heir
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
P
ennar
u
n
E
xt
e
nd me
r
ge-subtr
e
e t
e
sts to
t
est -Xsubtree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make "su
b
tree
"
pa
r
t more o
r
t
h
ogonal to
the
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull
:
Fix parsing
o
f -
X
<
option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
Teach gi
t
-pu
l
l to pass -
X
<
op
t
io
n
> to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery
Pennarun
g
it merge -X<option>
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 not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
M
erge branch 'tc/
t
est-loc
a
te-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commi
t
-st
a
tus
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
j
n/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch '
j
c
/maint-1
.
6
.
1-ch
e
ckout
-
m
-
custo
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge
b
ranch '
t
c/clone-v-p
r
og
r
ess'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
no
Merg
e
bran
c
h
'
tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
an
o
Mer
g
e bran
c
h
'jk/run-com
m
an
d
-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hama
n
o
Merge bra
n
c
h 'sr/gf
i
-options'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Update COPYING with GPLv2 with new
F
SF
a
ddres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
user_iden
t
_
s
ufficiently_given():
refactor
t
h
e logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
user_ident_su
f
ficiently_given()
:
refactor
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerer
e
:
honor co
n
flict-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
rerere: prepare for customizable conflict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
com
m
it
.
c::p
r
int
_
summary: d
o
no
t
r
elease the f
o
rma
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
conf
l
i
c
t-
m
ar
k
er-size: n
e
w a
t
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
man
o
r
erere: u
s
e l
l
_merge() instead of
usin
g
xdl_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
merge-tree
:
use ll_merge() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
ma
n
o
xdl_m
e
rge
(
): allow passing down m
a
rker_size in
x
mpara
m
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Hamano
xdl_merge
(
):
i
ntroduce xmpara
m
_
t
for
m
e
r
ge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(
)
: fix fu
n
ction signatu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
D
o not use date
.
c:tm_to_time_t() from
c
ompat/mingw
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
H
aczewski
MSVC: W
i
ndows-native
i
m
p
lementation for
subse
t
o
f Pthread
s
API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erg
e
branch '
c
c/r
e
se
t
-more'
commit
|
commitdiff
|
tree
2010-01-17
Ram
k
umar Ramachandra
Do
c
u
m
entation: Update gi
t
c
o
re
tutorial clarifying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay Jones
M
SVC: Fi
x
an "inc
o
mpatible pointer types"
c
ompiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
Sixt
W
i
ndows: av
o
id the "dup
dance" when spawning a c
h
i
l
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
n
e
s Sixt
Windows: sim
p
l
ify
the pi
p
e
(
2) implementa
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johan
n
es Sixt
Wind
o
ws: boost startup by avoiding
a
sta
t
ic dependency
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Erik
F
aye-Lu
n
d
W
in
d
ows: disable Pytho
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next