repo.or.cz
/
git
/
jnareb-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 Ham
a
no
M
e
r
ge bra
n
ch 'jc
/
conf
l
ic
t
-m
a
rker-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge branch 'ag
/
maint-apply
-
too-large
-
p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
m
ano
Merg
e
branch 'ap/m
e
rg
e
-
b
ac
k
e
n
d
-opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hama
n
o
Merge branch '
n
d/status-partia
l
-
r
efre
s
h
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ham
a
no
Merge remote branch '
r
emotes/tr
a
st-doc/for-n
e
xt'
commit
|
commitdiff
|
tree
2010-01-21
J
u
ni
o
C Ha
m
ano
Mer
g
e
branch 'jh/notes
'
(ear
l
y part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge branch 'jc/m
a
i
n
t-refresh-index-i
s
-optional-fo
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
e
rge b
r
a
n
ch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge b
r
anch
'j
c
/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Me
r
ge branch
'
j
s
/
exec-error-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge branch '
j
c/ls-files-ignore
d
-p
a
thspec'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge bra
n
c
h 'jc/gre
p
-loo
k
a
h
ead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge b
r
anch 'jc/maint-strbuf-add-fix-d
o
ublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'mm/confli
c
t-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Merge bra
n
ch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ham
a
no
Merge b
r
anch '
m
h/reb
a
se-fix
u
p'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge branch '
n
s/rebase-auto-sq
u
ash'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
rge br
a
nch 'mh/
r
ebase-fixup'
(early part)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
e
rge branch 'il/push-
s
et
-
upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge branch 'jk/warn-author-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge branch
'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
H
a
mano
Me
r
ge bran
c
h 'bk/
f
ix-relative
-
git
d
ir
-
fil
e
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Merge branch '
s
d/cd-
p
-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
H
a
mano
Merge branch 'j
c
/
s
y
m
bol-s
t
atic'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
date
.
c: mark
file-local f
u
nc
t
ion static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
amano
Syn
c
with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
G
i
t 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'bg
/
maint-remote-upda
t
e-default'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
M
erge branch 'sb
/
maint-octopus
'
into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ham
a
n
o
M
erge b
r
an
c
h 'bg/maint-add-a
l
l-doc' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge
branch 'mai
n
t
-1
.
6
.
5'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io 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
H
amano
Merge branch 'jk/m
a
i
n
t-1
.
6
.
5-reset-hard' into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
bra
n
ch 'tr/m
a
i
n
t-1
.
6
.
5-bash-p
r
ompt-sho
w
-submod
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Me
r
ge branch 'dp
/
mai
n
t-1
.
6
.
5
-fast-import-non-comm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jm/maint-
1
.
6
.
5
-grep-NUL-termin
a
te' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
st
a
tus: don't require the reposi
t
ory to be
w
r
itable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rg
e
branch
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
J
ohannes Sixt
Makefile
:
honor NO_CURL
when setting RE
M
OTE_C
U
RL
_
*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ta
r
migan Casebo
l
t
iden
t
.
c:
r
ep
l
ac
e
fprint
f
with fputs to suppress
compil
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái
Ngọ
c
Duy
rm
:
only refresh entries
that we may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisect: fix singular
/
plural grammar n
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Hamano
Merge
b
ranch 'maint-1
.
6
.
4
'
into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erg
e
branc
h
'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
m
aint-1
.
6
.
2' into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge co
m
mit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Fix mis-b
a
ckport of
t
7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
U
p
date draft relea
s
e notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
Hamano
M
e
r
g
e
bra
n
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
ma
n
o
Updat
e
draft r
e
l
ease note
s
to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bra
n
ch 'dp/main
t
-1
.
6
.
5-fast-import-n
o
n-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hamano
Merge branc
h
'
jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ran
c
h 'pc/uninteresting-sub
m
odule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
erge b
r
anc
h
'nd/include-
t
ermi
o
s-for-osol
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'
js/windows
'
commit
|
commitdiff
|
tree
2010-01-19
Da
n
iel
B
arkalow
Re
p
l
a
c
e
parse_blob() wi
t
h an explanatory co
m
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge branch 'jm/maint-1
.
6
.
5-gre
p
-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
Me
y
ering
grep: N
U
L termi
n
ate input from a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
n
d
reas G
r
uenba
c
her
builtin-apply
.
c: Skip filenam
e
s witho
u
t enough
co
m
ponents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
mano
s
yml
i
nks
.
c: remove
u
nused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
H
amano
o
bject
.
c:
r
e
m
o
v
e
unu
s
ed
fu
n
ctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
Docum
e
nt tha
t
merge strat
e
gies ca
n
n
o
w
t
ake their o
w
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
very P
e
n
n
ar
u
n
Extend merge-subt
r
ee tests to tes
t
-Xsubtre
e
=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Mak
e
"subtree" pa
r
t
more orthogonal
t
o
the re
s
t o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
pull: Fix pa
r
s
i
ng
of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
e
n
narun
T
each git-pull to p
a
ss -X<optio
n
>
to gi
t
-m
e
rge
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
Juni
o
C
Hamano
Update
dra
f
t
r
eleas
e
n
otes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
Hamano
Merge branch 't
c
/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merge br
a
nch 'jh/comm
i
t
-
status
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
M
e
r
ge branch
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
a
no
M
e
rge b
r
anch 'jc/maint-1
.
6
.
1-checkout-m-cus
t
o
m-merge
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
Merge
branch 'tc
/
clone-v
-
progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
e
rge br
a
nch 'tc/s
m
a
rt-h
t
tp-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
M
e
rge branch
'
jk/run-command-use-
s
he
l
l'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rg
e
branch 'sr
/
gfi-o
p
tio
n
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Update
COPYING wit
h
G
P
L
v2 wi
t
h new FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
u
s
e
r
_ident_sufficiently_
g
iven(
)
:
refacto
r
the log
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
user_ident_suf
f
icient
l
y_
g
iven(): ref
a
ctor
t
he logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere
:
honor confli
c
t
-marker-size att
r
ibute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere:
pre
p
are
for customiza
b
le conflict
marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
commit
.
c::print_su
m
mary: d
o
n
o
t release
t
h
e
f
ormat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conf
l
ict-m
a
rker-size
:
n
e
w
attr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C H
a
m
a
no
rerere: u
s
e
ll_merge() ins
t
ea
d
o
f using xdl
_
merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
H
a
mano
m
e
rge-tree: use
l
l
_merge(
)
not xdl_mer
g
e(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
xdl_merge():
a
llow
p
a
ssing down marker_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C H
a
mano
x
dl_merge()
:
int
r
o
d
u
ce xmparam
_
t for mer
g
e
s
p
e
cific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
git_attr(
)
: fix f
u
nction signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jo
h
ann
e
s Sixt
Do not use date
.
c
:
tm_to_
t
ime
_
t()
f
rom comp
a
t/m
i
ngw
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Andrz
e
j K
.
Haczewski
MSVC: Windows
-
n
a
tive imp
l
e
m
entat
i
on fo
r
subset of P
t
hreads API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merg
e
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Ham
a
no
M
e
rge branch 'cc/
r
eset-
m
o
r
e
'
commit
|
commitdiff
|
tree
2010-01-17
Ramkum
a
r Ra
m
ach
a
ndra
Documentatio
n
: Update git core tutorial clar
i
fying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay J
o
nes
M
S
VC:
F
ix an "incompatible point
e
r types" compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
o
hannes Sixt
Windows: avoid the "dup dance" when spawning a child
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johann
e
s
Sixt
Windo
w
s: s
i
mplify
the
pipe
(
2)
i
mplementation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
n
es Six
t
Windows:
boost
star
t
u
p
by avoiding
a
static dependen
c
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
E
rik Faye-
L
und
Window
s
: disa
b
le Py
t
h
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next