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
Junio C
Ha
m
ano
Me
r
ge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C
Ha
m
a
n
o
Merge branch 'jc/branch
-
d'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C Hamano
M
e
rge branch 'il/
r
e
v
-glob'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hama
n
o
Me
r
ge bran
c
h
'j
s
/
r
efer-upstream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
Hamano
Merge branch 'jl/su
b
module-dif
f
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ha
m
an
o
Merge bra
n
ch 'il/remote-upd
a
tes
'
commit
|
commitdiff
|
tree
2010-01-23
J
unio C Hama
n
o
Merge branc
h
'il/bra
n
ch-set-upstream'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C
Ham
a
no
Merge branc
h
'jc/maint-l
i
mit-
n
o
t
e-output'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
i
o
C Hamano
Merge branch 'nd/ls-
f
il
e
s-s
p
arse-fi
x
'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
ign
o
r
e
d
uplicated slashes
i
n make_relative_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Jun
i
o C Hama
n
o
git
-
m
v
: fix moving m
o
r
e
t
h
an o
n
e
source
t
o
a
single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C
H
ama
n
o
M
e
rg
e
b
ranch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
merge-recursive: do not r
e
turn
NULL o
n
ly to caus
e
segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
F
i
x
"
log --oneline" not to show notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
conf
l
i
c
t-marker-s
i
ze: add te
s
t and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update d
r
aft r
e
l
ease
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
g
e
b
r
anch
'b
w
/
c
v
simport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
erge bran
c
h 'jc/
c
hec
k
out-merge-bas
e
'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
Ha
m
ano
M
e
rge
b
ranch 'ag
/
p
a
t
c
h
-header
-
verif
y
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge
b
ranch 'jc/co
n
flict-m
a
rker-size'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Hamano
Merge branch 'ag/mai
n
t-appl
y
-
too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
M
erge bra
n
ch
'
ap/
m
erge-backend
-
opts'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch 'nd/s
t
a
t
us-partia
l
-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
r
ge remote
b
ran
c
h
'remotes/trast-doc/f
o
r
-
n
e
xt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch 'jh/not
e
s' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jc/
m
aint-refresh-in
d
ex-
i
s
-
o
ptional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Fi
x
"log" famil
y
n
o
t to be too
a
gressive
a
bout
showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch
'
rr/core-tu
t
orial'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
c
h
'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
js
/
exec-err
o
r
-report
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/ls-
f
i
l
es-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Mer
g
e
branch
'
j
c/gr
e
p-loo
k
a
h
ead'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
erge br
a
nch
'j
c
/main
t
-strbuf-add-fix-doubling
'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Mer
g
e
b
ra
n
c
h 'mm/confl
i
ct-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Mer
g
e b
r
anch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
a
mano
Mer
g
e
bran
c
h
'mh/rebase-f
i
xup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ranc
h
'ns/rebase-auto-squash
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
Merge branc
h
'mh/rebase-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
c
h
'
i
l/p
u
sh-set-upst
r
eam'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
mano
Merge branch 'jk/warn-
a
uth
o
r
-
comm
i
t
t
er
-
af
t
e
r
-co
m
mit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge bra
n
ch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
no
Merge br
a
nch 'tr/
h
tt
p
-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch
'bk/fix
-
rel
a
tive-gitd
i
r-f
i
le'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ham
a
no
M
e
rge b
r
anch 'sd/cd-p
-
show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
date
.
c: m
a
rk file-local function stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merge branch 'bg/maint-remote-update
-
default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e bran
c
h 's
b
/main
t
-o
c
top
u
s
'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Me
r
ge branch 'b
g
/maint-ad
d
-
all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branc
h
'maint-1
.
6
.
5' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Gi
t
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge bran
c
h '
j
k/ma
i
nt
-
1
.
6
.
5-r
e
set-har
d
' into
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
a
n
o
Merge
b
r
anch 'tr/maint-1
.
6
.
5
-
bas
h
-p
r
ompt-show-s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
man
o
Mer
g
e branc
h
'
d
p
/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'jm/maint-1
.
6
.
5-gr
e
p
-N
U
L
-
terminat
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Haman
o
Teach @{u
p
stream} syn
t
a
x
t
o
strbuf_branch
a
nme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
t1506: mo
r
e test for @{upstream}
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Fix "
c
heckout A
.
.
.
"
synonym for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't r
e
qui
r
e the repository to be wr
i
table
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
M
erge branch
'maint
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Hamano
M
erge branch
'maint-1
.
6
.
3' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branc
h
'
m
a
i
nt-1
.
6
.
2' i
n
to maint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hama
n
o
Merge
commit 'v1
.
6
.
4
.
4
-
8-g8de6518' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C H
a
mano
Fix mis-
b
ackport
o
f t
7
002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update dr
a
ft
r
el
e
a
s
e notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
an
o
Update dr
a
ft re
l
ease not
e
s
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Ham
a
no
Merge bran
c
h 'dp/maint-1
.
6
.
5-f
a
st-imp
o
rt-
n
o
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
m
ano
Merge
branch
'
pc/uninteresting-su
b
modul
e
-disap
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ha
m
ano
Merge branch 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch '
j
s/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge branch 'jm/maint-1
.
6
.
5-grep-NUL
-
terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
symlinks
.
c: remove unused functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c: remove
unuse
d
functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
D
ocument that merge str
a
te
g
ies c
a
n now
t
ak
e
t
heir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Make "subt
r
ee" part more
o
rthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
pu
l
l: Fix pars
i
n
g of
-X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
a
m
ano
U
p
date draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merge branch 'tc/
t
e
st-loc
a
te-h
t
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Merg
e
branch 'jh/
c
ommit-status'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o
C
H
a
mano
Merge br
a
nch 'jn/makefi
l
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge br
a
nch 'jc/main
t
-1
.
6
.
1-chec
k
out-m-custom-mer
g
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch 'tc/cl
o
ne-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Haman
o
Merge branch 'tc/sma
r
t
-http
-
restrict
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jk/r
u
n-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
a
no
M
e
r
ge
branch 's
r
/g
f
i-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Updat
e
CO
P
YING wit
h
GPLv2 with ne
w
FSF addr
e
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
user_iden
t
_sufficiently_given(): refactor the
l
ogic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
ser_ident_suff
i
ci
e
ntly
_
given(): refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
re
r
ere: honor conflict-m
a
rker-
s
ize
a
t
t
ri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
r
erere: prepare for cus
t
omizable conflict marker le
n
gt
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
commit
.
c::prin
t
_summary:
d
o not release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Ham
a
no
conflict-mar
k
er-siz
e
: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Ham
a
no
rerere: use
l
l_me
r
ge() instead of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
merge-tree:
use ll_merge() not xd
l
_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next