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
J
u
n
io C Hamano
Merg
e
bra
n
ch 'jc/confl
i
ct-marke
r
-size
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h 'a
g
/
m
ai
n
t-apply-too-larg
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge
branch 'ap/merg
e
-ba
c
kend-
o
p
ts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge branch 'nd/status-p
a
rtial-ref
r
esh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge rem
o
te
branch 'r
e
motes/
t
rast-doc/f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C H
a
mano
Merg
e
b
r
anch '
j
h/
n
otes' (early pa
r
t)
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o
C Ham
a
n
o
Merge b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C
Hama
n
o
M
erg
e
branch 'jc/maint-re
f
r
e
sh-in
d
ex-
i
s-
o
ptional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'rr/co
r
e
-
tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
amano
Merge branch 'jc/cac
h
e-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Haman
o
M
e
rge
branch 'js/e
x
e
c
-e
r
r
or-
r
epo
r
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
ano
Merge
branc
h
'jc/ls-fi
l
e
s
-ignore
d
-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
amano
Merge bra
n
ch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'jc/maint-st
r
b
u
f
-add-
f
ix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge bra
n
c
h
'mm/co
n
flict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Ha
m
ano
Merge branch
'
d
a/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
an
o
Me
r
ge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Mer
g
e b
r
anch 'ns/re
b
ase-auto
-
s
quash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
no
M
e
rge
b
r
anch 'mh/rebase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
Merge bra
n
c
h
'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
Me
r
ge br
a
nch 'jk/warn-author-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Me
r
g
e branc
h
'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 't
r
/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Ha
m
a
n
o
Merge branch 'bk/fix-rel
a
tive-gitd
i
r-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'sd/cd-p-show-to
p
level'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Merg
e
branch 'jc/symbol-st
a
ti
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mar
k
file-l
o
cal functi
o
n s
t
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
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 Ha
m
ano
G
i
t 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
Merge branch
'bg/
m
aint-
r
emote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
bran
c
h 'sb
/
maint-oct
o
pus' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branch '
b
g/
m
a
int-
a
dd-all-doc'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
branch 'maint-1
.
6
.
5' into maint
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
Ju
n
i
o C Hamano
Merge b
r
anch 'jk/maint-1
.
6
.
5-r
e
se
t
-
hard'
i
n
to mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge b
r
anch
'tr/maint-1
.
6
.
5-bash
-
p
r
om
p
t-
s
ho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'dp/
m
aint-1
.
6
.
5-f
a
st-import-non-com
m
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
M
e
rge branch 'jm/
m
aint-1
.
6
.
5-g
r
ep-NU
L
-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
s
tatu
s
:
d
on't requi
r
e the repo
s
ito
r
y to
b
e writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile:
honor NO_C
U
RL
w
hen setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
T
a
rmigan Casebolt
ident
.
c:
r
e
p
lace f
p
rintf with fput
s
to
suppress comp
i
l
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái N
g
ọc Duy
r
m
: only refresh entries t
h
at we may t
o
uch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Dav
i
d
Rip
t
on
bise
c
t
: fix
singular/plural g
r
ammar
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
Merge branch 'maint-1
.
6
.
4
' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
H
amano
M
er
g
e bra
n
ch 'm
a
int-1
.
6
.
3' into main
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge branch
'
main
t
-1
.
6
.
2' into mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge commit 'v1
.
6
.
4
.
4-8
-
g
8
d
e6518' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Fix mis-backpor
t
o
f
t
7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Upda
t
e draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
branch 'dp/mai
n
t-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge bra
n
c
h
'jc/r
e
r
e
r
e'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C
Hamano
Me
r
ge branch 'pc/uninteresting-su
b
module-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge bra
n
ch 'nd/include-termios-
f
or-osol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Hamano
Merge branch 'js/wi
n
dow
s
'
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Replace p
a
r
se_blob() with an explanatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
H
amano
Me
r
ge
b
r
anch 'jm/maint-1
.
6
.
5
-grep-NUL-te
r
minate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyerin
g
gr
e
p: N
U
L te
r
minate inpu
t
from a f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
And
r
e
as Gruenbacher
bu
i
ltin-apply
.
c: Skip
f
ilenames withou
t
enoug
h
component
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
s
ymlinks
.
c
:
r
emo
v
e
unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
object
.
c: remo
v
e unused fu
n
ctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
D
o
c
ume
n
t that merge strateg
i
es c
a
n now take
their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Pennarun
E
xtend
me
r
ge-subtr
e
e te
s
ts to t
e
st -Xs
u
bt
r
ee=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Ma
k
e
"s
u
btree
"
p
a
r
t
m
o
re ortho
g
onal
to the rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: F
i
x
p
arsi
n
g
of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
ver
y
Pennarun
Teach gi
t
-p
u
ll t
o
pass -X<option> to git-
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
enn
a
run
g
i
t merg
e
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hama
n
o
U
pdate draft re
l
ease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C
Hamano
Merge br
a
nch 'tc/test-locate-h
t
tpd
'
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
Me
r
ge branch '
j
h
/commit-status
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
erg
e
branch 'jn/makef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Ham
a
no
Merge branch 'jc/maint-1
.
6
.
1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
M
e
r
ge branc
h
'tc
/
cl
o
ne
-
v-progress
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C H
a
m
a
no
Merge branch
'
tc/sma
r
t-htt
p
-
r
es
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Haman
o
M
e
rge
b
ranch 'jk/run-comm
a
nd-
u
s
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
n
o
Merge branch 'sr/gfi-
o
pti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Upd
a
te COPYING
with GPLv2 wit
h
new FSF a
d
dress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
s
er_ident_sufficiently_given(): refactor the l
o
gic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
user_ident_
s
ufficient
l
y_given
(
): refacto
r
th
e
l
o
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Ha
m
ano
rer
e
r
e: honor confli
c
t-m
a
rker-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
re
r
er
e
: pr
e
pare fo
r
cus
t
o
mi
z
a
b
l
e
con
f
l
ict m
a
rker len
g
th
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
comm
i
t
.
c::pr
i
nt_summary: do not release the for
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-mark
e
r-size: new att
r
ibute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
r
ere
r
e: use ll_
m
e
r
ge()
i
nstead of using
x
d
l_merg
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree: use ll_
m
erge(
)
not xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
x
dl_merge(): allow passing down marker_size in xm
p
a
ram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
xdl_mer
g
e():
intro
d
uce xmparam_t for mer
g
e
sp
e
c
i
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
git
_
attr(): fix
function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
oh
a
nnes Sixt
Do not use date
.
c
:tm_
t
o_t
i
me_t() from
c
om
p
at/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
H
a
czewski
MSVC: Wind
o
ws-n
a
tive implementat
i
on
f
or subs
e
t of Pthreads API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C Ham
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
M
e
rge
branch 'c
c
/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
R
amkumar Ram
a
c
h
andra
Documentat
i
o
n
: Upd
a
te git co
r
e tutorial
c
l
arifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay Jones
MSVC: Fix a
n
"incom
p
atib
l
e
p
ointer types"
c
ompiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Wi
n
d
ows:
a
v
oid the "dup dan
c
e" whe
n
spawn
i
ng a child
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes Sixt
Windows: simplify
the pipe(2) implementatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Wi
n
dows: boost start
u
p by avoiding a static dependenc
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Erik F
a
ye-
L
u
nd
Windows: disable Py
t
hon
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next