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/maint-limit-note-output'
2010-01-23
Jun
i
o
C Hamano
M
e
rge br
a
nch 'jc/main
t
-limit
-
note-out
p
ut'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io
C Hamano
Merge br
a
nch '
n
d/ls-files-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
i
o C Hamano
git-mv:
fix moving mor
e
tha
n
on
e
s
o
urce to
a
s
ingle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Juni
o
C
H
amano
M
e
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
m
erge-
r
ecu
r
sive: do not retu
r
n NULL
only to cause
seg
f
a
ult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
no
Fix "l
o
g
--oneline" no
t
to
s
how
n
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
c
o
nfli
c
t-marker-size:
a
d
d te
s
t and docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Updat
e
d
r
aft release notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge br
a
n
ch
'bw/
c
vsimport
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
M
erg
e
br
a
n
c
h 'jc
/
checko
u
t-
m
erge-base'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branc
h
'ag/
p
atch-header-ver
i
fy'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merg
e
branch 'jc
/
confl
i
ct-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'ag/maint
-
apply-too
-
large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge
b
ranch
'
ap/merg
e
-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
r
anc
h
'
nd/statu
s
-par
t
ial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge rem
o
te branch 'r
e
motes/tr
a
st-doc
/
for-next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
M
erg
e
branch 'jh/note
s
' (ea
r
ly p
a
rt)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jc
/
maint-refresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
H
amano
Fi
x
"
log"
f
a
m
ily n
o
t to
b
e t
o
o agressive a
b
ou
t
showing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merg
e
b
r
anch 'rr/
c
ore-
t
ut
o
r
ia
l
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Me
r
ge
b
r
anch 'jc/cac
h
e-
u
n
m
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
an
o
Merg
e
b
r
anch 'js/exec-er
r
o
r
-
r
ep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
n
o
Mer
g
e branc
h
'j
c
/ls-f
i
l
es
-
ignored-paths
p
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bra
n
ch 'jc/grep
-
lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Me
r
ge br
a
nch '
j
c
/
maint-strbuf-add-
f
ix
-
do
u
bling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'mm/conflict-
a
d
vice'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Hamano
Me
r
ge branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
erge branch 'm
h
/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch
'ns/rebase-a
u
to-
s
quash'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Mer
g
e branch 'm
h
/reb
a
se-fixup'
(
ea
r
ly par
t
)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Me
r
ge branch
'i
l
/pu
s
h
-set-upstre
a
m'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk/warn
-
autho
r
-c
o
mmi
t
ter
-
a
f
te
r
-com
m
i
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e bran
c
h 'jc/id
e
nt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch '
t
r/http-p
u
sh-ref-statu
s
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
ma
n
o
Merge
bra
n
ch '
b
k/fix-rela
t
ive-gitdi
r
-file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
ama
n
o
Merge branch 'sd/cd-p-show-topleve
l
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge branc
h
'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
d
a
t
e
.
c: mark f
i
l
e-local fun
c
tion s
t
atic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
S
ync
w
ith 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
Junio C Hamano
Merg
e
branch
'
bg/maint-r
e
mo
t
e-update-default'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'sb/maint
-
octopus
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
b
g/maint-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Hamano
Merge branch 'maint-1
.
6
.
5' into
mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'jk/maint-1
.
6
.
5-reset-hard' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Mer
g
e branch 't
r
/
main
t
-1
.
6
.
5-bash-promp
t
-show-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Mer
g
e branch 'dp/main
t
-
1
.
6
.
5-fast-imp
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branc
h
'jm/ma
i
nt
-
1
.
6
.
5-g
r
ep-NUL-termi
n
ate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
F
i
x "chec
k
o
u
t
A
.
.
.
" syn
o
n
ym for "c
h
ec
k
out A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
amano
s
tatus: don't requir
e
the repository
to be writa
b
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge bran
c
h 'maint-1
.
6
.
4' i
n
to maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Ha
m
ano
Merge branch 'maint-1
.
6
.
3'
in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch
'maint-1
.
6
.
2' i
n
to maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
ama
n
o
Merge commit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
F
i
x mis-backport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Update draf
t
rele
a
se notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hama
n
o
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
Update d
r
a
f
t
r
elease
not
e
s
t
o 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge
b
ranch 'dp/maint-1
.
6
.
5-
f
a
s
t
-i
m
port
-
non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
M
erge bran
c
h
'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge
branch
'
pc
/
uninter
e
s
ting-submo
d
ule-disappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
Ha
m
an
o
Merge branch '
n
d/include
-
t
e
rmios-f
o
r-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch '
j
s
/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge
branch
'
jm
/
maint-1
.
6
.
5-grep-NUL-termina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
syml
i
n
ks
.
c: re
m
o
v
e
unused func
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C Hamano
object
.
c: remo
v
e unus
e
d
functi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Do
c
ument that merge str
a
teg
i
es can now t
a
ke t
h
eir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Make
"
sub
t
r
e
e
" part
m
ore
o
r
t
hogonal
to
t
he re
s
t of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix parsing of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
an
o
U
p
date d
r
aft release notes
t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merg
e
branch
'
tc/
t
est-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C
H
amano
Merge branch 'jh/commit-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'jn/
m
akef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge
b
ranch 'jc/maint
-
1
.
6
.
1-c
h
ec
k
o
ut-m
-
custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
Merge
b
r
a
nch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
no
Me
r
ge bran
c
h 'tc/smart-ht
t
p-res
t
r
ict'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'jk
/
run-
c
ommand-us
e
-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
ranc
h
'sr/gfi-opt
i
ons'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Up
d
ate COPY
I
NG with GPLv2 with new
F
SF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_
i
dent_suffici
e
ntly_g
i
ven
(
): refactor the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Hamano
user_
i
de
n
t_su
f
ficiently_given
(
): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
rere
r
e: honor conflic
t
-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rere
r
e: p
r
epare f
o
r customi
z
able conflict marker leng
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
commit
.
c
::print_
s
ummar
y
: do not release
t
he format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
Ham
a
no
c
o
nfli
c
t-marke
r
-
s
i
ze: new
a
ttrib
u
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
rerere:
u
se ll_merg
e
()
instead
o
f
using
x
dl_merge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tre
e
: use ll_m
e
rge() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
ano
x
dl_merge():
allow passing down marker
_
s
ize in x
m
param_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_mer
g
e
()
:
i
n
t
roduce xm
p
aram_t for mer
g
e
specific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix fu
n
ct
i
on si
g
na
t
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Merg
e
branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
i
o
C Ham
a
no
grep --
n
o-index
:
allo
w
use of "git grep"
o
uts
i
de a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Ju
n
io
C
Ha
m
ano
g
rep: prep
a
re
t
o
ru
n
o
u
tside of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
Merge branch
'
jc/chec
k
out-m
e
rge
-
b
a
se'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
Mer
g
e branch 'rs/ma
i
n
t
-archi
v
e-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Merge branch 'il/vcs
-
helpe
r
'
commit
|
commitdiff
|
tree
next