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
Juni
o
C H
a
m
a
no
M
erge branch 'jc/c
o
nflict-
m
arker-si
z
e
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge branch
'ag/maint-
a
pply-
t
oo-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
e
rge branch 'ap
/
mer
g
e-backend-op
t
s'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
erge branch 'nd/s
t
atus-par
t
ial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge rem
o
te branch 'remotes/tr
a
s
t
-doc/for-ne
x
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
branch 'jh/not
e
s' (ear
l
y part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
a
n
o
Merge branch
'
jc
/
main
t
-refresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
rge branc
h
'rr/c
o
re-tutor
i
al'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Merge
branch '
j
c/cache-u
n
merge
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bra
n
ch 'js/exec-
e
rror-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch
'
jc/ls-fi
l
e
s-ign
o
red-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branc
h
'jc/g
r
ep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'jc/mai
n
t-strbuf-add-f
i
x-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
aman
o
M
e
rge branch 'm
m
/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'da/
d
i
fftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch '
m
h/
r
ebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'ns/r
e
b
a
se-auto
-
squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'mh/reba
s
e-fixup'
(
e
a
rly p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
il/push-
s
e
t
-
upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
b
r
anc
h
'jk/warn-auth
o
r-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'jc/iden
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/http-pus
h
-re
f
-
s
tatus'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ham
a
no
Merge
branch 'bk/f
i
x-
r
elative-gitdir-fil
e
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Merge branch 'sd/cd-p-
s
how-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
am
a
no
Merge branch
'jc/symbol-stat
i
c'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
date
.
c:
mark file-local
function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o
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 H
a
m
a
no
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge br
a
nch 'bg/main
t
-re
m
ote-update-defaul
t
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
Merge branch 'sb/m
a
int-octopus' into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
Merge branch 'b
g
/ma
i
n
t-add-all-doc' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branc
h
'maint-1
.
6
.
5
' into
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
G
i
t 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
Merge bran
c
h 'jk/maint-1
.
6
.
5-reset-hard' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Haman
o
Merge
b
ran
c
h 'tr/maint-
1
.
6
.
5-bash-pr
o
m
p
t-show-s
u
b
mod
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e branc
h
'dp/ma
i
n
t
-
1
.
6
.
5
-
fast-import-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
r
g
e
b
r
anch 'jm/
m
aint-1
.
6
.
5-gr
e
p-NU
L
-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
n
o
status: do
n
'
t requi
r
e
t
he repositor
y
to be wr
i
table
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
4' int
o
maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ham
a
no
M
e
rge branch 'ma
i
n
t
-1
.
6
.
3' int
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C
Hamano
Me
r
ge branch
'maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Hamano
Merge com
m
it 'v1
.
6
.
4
.
4-8-
g
8de6518' int
o
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
Fix mis-backport of
t
7
002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Updat
e
draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Update draft
release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
Hamano
Merge branch 'd
p
/maint-1
.
6
.
5-fa
s
t-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Me
r
ge b
r
a
nch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bran
c
h '
p
c/
u
nint
e
resting
-
su
b
module-dis
a
ppea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merg
e
bra
n
ch 'nd/include
-
termios-for
-
osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Me
r
ge branch 'js/window
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch 'jm/maint
-
1
.
6
.
5-grep-NUL-terminate
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Ha
m
ano
symlinks
.
c:
r
emove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
object
.
c: r
e
m
o
ve unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that merge strateg
i
es can now take
t
he
i
r own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Haman
o
Make "subt
r
ee" p
a
rt mo
r
e
o
rtho
g
onal to
t
he
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: F
i
x pars
i
ng of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C Ha
m
ano
U
pdat
e
draft release not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hama
n
o
Merge branch 'tc/
t
est-locat
e
-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge bran
c
h 'jh/co
m
mit-stat
u
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Merge
b
ranch
'
j
n
/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bra
n
ch 'jc/maint-1
.
6
.
1-checkout-m-custom
-
m
e
rge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/clone-v-pr
o
gress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
Mer
g
e branch 'tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
ama
n
o
Merge branch 'jk/run-comm
a
nd-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Hamano
Me
r
ge b
r
anch 'sr/gf
i
-
options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Update
COPY
I
N
G
w
ith
GPLv2 with
new
FS
F
a
d
d
ress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_ident_
s
ufficiently_gi
v
en()
:
refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C Hamano
user_
i
dent_suff
i
ci
e
ntly_g
i
ven(
)
: refactor the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ha
m
ano
r
e
r
ere: honor co
n
flict-mar
k
er-
s
i
ze attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
rerere: prepare fo
r
c
ust
o
m
i
z
a
ble confli
c
t
m
arker
length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
commit
.
c::prin
t
_sum
m
ar
y
: d
o
not rel
e
as
e
the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
confli
c
t-mark
e
r-size: new attr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Ham
a
no
r
erere: use ll_merge() i
n
s
t
ead of using xdl_mer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
merge-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
Jun
i
o
C
Ham
a
n
o
xdl_merge
(
): al
l
o
w
p
assing do
w
n
marke
r
_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
H
amano
x
d
l_merge(): introduce xmparam_t for merge specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hama
n
o
git_attr()
:
fix function
signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
m
ano
Mer
g
e bra
n
c
h
'main
t
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Ha
m
ano
Me
r
ge br
a
nch 'c
c
/res
e
t-more'
commit
|
commitdiff
|
tree
2010-01-15
Junio
C Hamano
grep --
n
o-
i
n
dex:
a
l
low use of
"
gi
t
grep" o
u
tside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ha
m
ano
grep: pre
p
a
r
e to run o
u
tsid
e
of a work t
r
ee
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
Merge bra
n
ch 'j
c
/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C
Hamano
M
e
r
ge b
r
anch 'rs/maint
-
ar
c
hi
v
e-match-paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Ha
m
a
n
o
M
e
rge
branch
'
il/
v
cs-help
e
r
'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf(): allow p
a
ssin
g
the same buf to
d
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Me
r
ge
branc
h
'cc/
r
eset
-
m
o
re'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merge branch 'nd/spar
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hama
n
o
t7502:
test commit
.
statu
s
,
-
-status and
-
-
no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
amano
grep:
rip out pessi
m
izatio
n
t
o
use
fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C
Hamano
gr
e
p: rip
o
ut s
u
p
p
ort for extern
a
l gr
e
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
M
e
rge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
str
b
uf
.
c: remove unus
e
d
f
u
n
c
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
aman
o
sh
a
1_file
.
c
: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
m
ailmap
.
c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
utf8
.
c: mark fi
l
e-local function st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
Hamano
s
ubmodule
.
c: mar
k
file-local f
u
n
c
tion
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
quo
t
e
.
c:
m
ark file-local fu
n
ction static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next