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 'nd/ls-files-sparse-fix'
2010-01-23
Junio C Hamano
M
e
rge bra
n
ch 'nd/l
s
-files
-
sparse
-
fix'
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio C Haman
o
git-mv: fix mov
i
ng more than one
s
ource
t
o a single
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
M
e
r
g
e b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Haman
o
m
e
rge-recur
s
ive: do not ret
u
rn N
U
LL only
to
c
a
use segfa
u
l
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
co
n
flict-marker-size: add
t
est
a
n
d
doc
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Ham
a
no
Update draft r
e
le
a
se not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
a
n
o
Merge branch
'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge
b
ranch '
a
g
/
patch-hea
d
er-v
e
rify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
a
n
o
Merge branch 'j
c
/conflict-marker-s
i
ze
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
man
o
Me
r
ge branch
'
ag/main
t
-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merg
e
branch
'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e b
r
anch 'nd/statu
s
-part
i
a
l
-ref
r
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
ma
n
o
Mer
g
e
remote branch 'remotes/trast-doc/
f
o
r-ne
x
t'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
am
a
no
Merg
e
branch 'jh/notes' (early p
a
r
t
)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
M
erge branch 'jc/maint-refresh-index-i
s
-opt
i
onal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'rr/c
o
re-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Mer
g
e b
r
anch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
ma
n
o
Merge
branch 'js/exec
-
error-re
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hama
n
o
Merge branch 'jc/ls
-
files-ign
o
red-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
erge branch 'jc/gre
p
-
l
o
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge
b
r
anch 'jc
/
maint-strbuf-add-fix
-
doubl
i
n
g
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
Mer
g
e branch 'd
a
/difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
er
g
e b
r
anch 'mh/reb
a
se-fixup
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Mer
g
e branch 'ns/rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'm
h
/rebase-fixup' (early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
m
a
no
M
erge b
r
a
nch 'j
k
/warn-author-
c
ommitter-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
no
Me
r
ge branch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge br
a
nch 'tr/http-push
-
ref-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'b
k
/fix-re
l
ative-gitdir
-
file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-show-toplevel
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
H
amano
Merge bra
n
c
h 'j
c
/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
d
a
t
e
.
c: mark file-local
f
u
nct
i
o
n
sta
t
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Sync with 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Git 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-remote-upd
a
te-def
a
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Mer
g
e bran
c
h
'sb/maint-
o
c
to
p
u
s
' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C H
a
mano
M
erge b
r
a
n
c
h 'bg/mai
n
t-add-all-doc'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ra
n
ch '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
Juni
o
C
Hama
n
o
Merge
b
r
anc
h
'jk/maint-1
.
6
.
5-reset-hard' into m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'
tr/maint-1
.
6
.
5
-
bash-prompt-sho
w
-s
u
bmo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'dp/maint-1
.
6
.
5-fast
-
import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Me
r
ge branch
'j
m
/maint-1
.
6
.
5
-
grep-NU
L
-
ter
m
inate
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Fix "checkout A
.
.
.
" synonym for "ch
e
ckout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
s
tatus: do
n
't require the repository to
be wri
t
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C
H
a
m
a
n
o
M
e
rge branc
h
'maint
-
1
.
6
.
4
' into m
a
in
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
no
Merge br
a
nch
'maint-
1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ham
a
no
Merg
e
branc
h
'm
a
int-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
commit 'v1
.
6
.
4
.
4
-
8-g8de6518' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o C Hamano
F
ix mis-back
p
ort o
f
t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio 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-19
Junio C Hama
n
o
Merge br
a
nc
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
Hamano
U
p
date draft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ha
m
ano
M
erge
b
r
a
n
ch 'dp/maint-1
.
6
.
5-fast-import-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge
branch 'j
c
/rerer
e
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
branch 'pc/un
i
nteres
t
i
n
g-submodule-dis
a
ppea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'nd/include-termios-for
-
osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hama
n
o
M
er
g
e b
r
anch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge bran
c
h '
j
m/maint-1
.
6
.
5-gr
e
p-NUL-termina
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io
C
Hamano
syml
i
nks
.
c: rem
o
ve unused f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
o
b
ject
.
c: remove
u
nus
e
d funct
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Docume
n
t th
a
t merge
strateg
i
es can now take th
e
ir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Make
"
subtree" part mo
r
e
o
rthogonal
to t
h
e
r
e
st 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
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-18
J
u
nio C Haman
o
Merge branch 'tc/
t
est-l
o
cat
e
-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commit-s
t
a
tus
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Me
r
ge branch
'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch '
j
c/ma
i
nt-
1
.
6
.
1-checkout-m-custom-merg
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
er
g
e br
a
nch 'tc/cl
o
ne
-
v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
Merge bra
n
ch 'tc/smart-htt
p
-res
t
r
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
M
erg
e
branch 'jk/
r
un-comman
d
-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
Ha
m
ano
Merge bran
c
h '
s
r/gfi-options
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Update COP
Y
ING with GPLv2 wi
t
h
n
e
w FSF
address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_suff
i
ciently
_
given(): refactor the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
u
s
e
r_ident_suff
i
c
i
ently_given():
r
efactor the logi
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C Hamano
rerere: honor con
f
lict-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hama
n
o
rerere: prepare for c
u
stomizable con
f
lict mar
k
er le
n
gth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
commit
.
c:
:
p
r
int_summary
:
do not
r
elease the for
m
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conf
l
ic
t
-mar
k
er-size: new attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
rerere: use ll_mer
g
e() ins
t
e
a
d of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
merge-
t
ree: use
ll_merge
(
) not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_me
r
g
e
(
)
: all
o
w
p
assi
n
g
down
m
a
rker_s
i
ze in xmp
a
ram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_me
r
ge(): introduce xmparam_t
f
or
m
erge speci
f
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
aman
o
git_attr(): fix function signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C Hama
n
o
Merge
branch
'cc/reset-m
o
re'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --
n
o-
i
ndex: a
l
low use
o
f "
g
it 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: prepare to run o
u
tside of a w
o
r
k tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
M
er
g
e branch 'jc/che
c
kout-merge
-
base'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hama
n
o
Merge branch 'rs
/
maint
-
arch
i
v
e
-match-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
e
rge
b
ranch
'il/vcs-helpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Haman
o
strbuf_addbuf()
:
al
l
ow passing the same
buf to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
Merge bran
c
h
'
cc/
r
eset
-
more'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
H
amano
Merg
e
branch 'n
d
/sparse'
commit
|
commitdiff
|
tree
next