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
msvc: Fix a compiler warning due to an incorrect pointer cast
2010-01-23
Jun
i
o
C
Ha
m
a
no
M
e
rge branch '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Haman
o
Merge branch 'jc
/
branch-d'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C Hamano
Me
r
ge branch 'il/r
e
v-
g
lob'
commit
|
commitdiff
|
tree
2010-01-23
J
u
n
io C Hamano
Merge branch 'js/refer-
u
pstream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C H
a
mano
M
e
rge branch 'jl
/
su
b
m
o
dule-diff
'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C
Hamano
Merge branch 'il/remote-update
s
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
M
e
rge branch 'il/bran
c
h
-
set-upstream'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C Haman
o
Merge branch 'jc/maint-limit-note-
o
utpu
t
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge br
a
nch 'nd
/
ls
-
files-sparse-fix'
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
i
o C Hama
n
o
ignore duplicated slashes in
m
ake_relative
_
pa
t
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C Hamano
git-mv:
f
ix moving
m
ore tha
n
one source to
a
sin
g
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C Ha
m
ano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C Hamano
merge-recur
s
i
v
e: do not return NULL o
n
l
y
to
cause
segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
F
ix "log --one
l
ine" not t
o
show
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
conf
l
ict
-
marker-siz
e
: add
t
est and
d
o
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
un
i
o C Haman
o
Merge
b
ra
n
ch
'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge
branch 'jc/check
o
ut-merg
e
-bas
e
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
M
erge branc
h
'ag/p
a
tch-he
a
der-ve
r
ify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
mano
M
e
r
g
e
b
r
anch 'jc/c
o
nflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge branch 'ag/m
a
int-ap
p
l
y
-to
o
-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
M
e
rge bra
n
c
h
'ap/mer
g
e-ba
c
kend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
r
ge branch 'nd/status
-
pa
r
tia
l
-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merg
e
rem
o
te
br
a
nch 'remotes
/
trast-doc/fo
r
-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge bra
n
ch
'
jh/notes'
(
early part
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hama
n
o
Merge branch 'jc/maint-refr
e
sh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fix "log"
family not t
o
be too
agress
i
ve abou
t
showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
m
ano
Merg
e
branch
'
rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'jc/c
a
che-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge branch 'j
s
/e
x
e
c-error-report
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'jc/ls-fil
e
s-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
br
a
nch 'jc/grep-loo
k
ahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'jc/m
a
int-strbuf
-
add-fix-doubl
i
ng'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'mm/confl
i
c
t-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'mh/rebas
e
-fixup
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge
b
ranch 'ns/reba
s
e-auto-s
q
uas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ranch
'
mh/reba
s
e-fixup'
(earl
y
p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch 'il/p
u
sh-se
t
-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Mer
g
e
branch 'jk/w
a
rn-
a
uthor-comm
i
t
ter-af
t
er-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e bran
c
h 'jc/iden
t
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C H
a
m
a
no
Merge
branch 'tr/
h
ttp-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
M
e
r
ge branch 'bk
/
fix-rel
a
tive-gi
t
dir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-show
-
toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge
b
ranch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
date
.
c: mar
k
file-local fu
n
ction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C H
a
mano
S
ync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ha
m
a
n
o
Merge bran
c
h 'bg/maint-
r
emote-u
p
date-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
mano
M
erg
e
branch 's
b
/
m
aint-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
aman
o
Me
r
g
e branch 'bg/
m
aint-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'maint-1
.
6
.
5'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Ha
m
a
no
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e br
a
nch 'jk/ma
i
nt-1
.
6
.
5-reset-hard' into ma
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'tr/maint-1
.
6
.
5
-bash-pr
o
mpt-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge br
a
nch 'dp/
m
aint-
1
.
6
.
5
-
fa
s
t-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jm/m
a
int-1
.
6
.
5-grep-NUL
-
t
er
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Teach @
{
u
p
stream} syntax to
strbuf_bran
c
ha
n
me(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
t1506: more test for
@{upstr
e
am} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Fi
x
"checkout
A
.
.
.
" syn
o
nym
for "checkout A
.
.
.
H
E
AD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
statu
s
:
don't
r
equire the repository to be wri
t
ab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C H
a
mano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
M
erge bran
c
h
'
ma
i
nt-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge
b
ran
c
h 'main
t
-1
.
6
.
3
'
i
nto maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
m
a
int-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge co
m
mit 'v1
.
6
.
4
.
4-8-
g
8de6518' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io
C Ham
a
no
F
ix mis-backport of
t
7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C H
a
mano
Update d
r
aft releas
e
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
n
o
Update d
r
aft r
e
lease notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
erge branc
h
'd
p
/
m
a
i
nt
-
1
.
6
.
5-fa
s
t-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hama
n
o
M
e
r
ge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C H
a
mano
M
e
rge br
a
nch 'p
c
/unint
e
res
t
in
g
-submodul
e
-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Mer
g
e br
a
nch 'nd/include
-
termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge br
a
nch 'js/windows
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hama
n
o
Merge
b
ranch 'jm/mai
n
t-1
.
6
.
5-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
sym
l
inks
.
c: re
m
ov
e
u
n
used
func
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
H
a
m
ano
object
.
c: remove unused
f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
ano
Document that
mer
g
e strategies can
n
o
w t
a
k
e their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Make "subt
r
ee" par
t
more orthogonal
t
o
the re
s
t of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull
:
F
i
x parsin
g
of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Updat
e
draft releas
e
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge br
a
nch
'
t
c/te
s
t-l
o
cate
-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
erg
e
branch 'jh/comm
i
t
-
sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
Merge branch 'jn/m
a
k
e
fi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch '
j
c/maint-1
.
6
.
1
-
checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C
Haman
o
Merg
e
branch 't
c
/clo
n
e-v
-
p
r
o
g
ress'
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o
C
H
amano
Merge bra
n
ch
'
t
c/s
m
art-htt
p
-restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C H
a
m
a
n
o
Merge
b
ranch
'jk
/
run-command-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C
Hamano
Merge branch
'
sr/gfi-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Update COPY
I
NG wi
t
h GPLv
2
w
ith new F
S
F a
d
dress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_su
f
ficiently_g
i
v
e
n(): refactor
t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
ser_ident_s
u
fficiently
_
given():
r
e
f
actor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
rerere: honor
conflict-marker-siz
e
attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
amano
r
er
e
r
e: prep
a
re for customiza
b
le conflict marker
l
e
ngth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
com
m
it
.
c::print_
s
u
m
mary: do not r
e
lease the
forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
co
n
flict-m
a
r
k
er-size: new a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use ll_
m
erge()
i
n
stead of using xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
m
erge-tree
:
use
l
l_merge() not
xdl
_
merge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next