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
format-patch: use a string_list for headers
2010-01-21
Juni
o
C Hamano
Mer
g
e br
a
nch 'jc/conflic
t
-
marker-size'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Haman
o
Merge branch 'a
g
/ma
i
nt
-
app
l
y-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch '
a
p/merge-backe
n
d-opt
s
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
amano
Me
r
ge branch
'nd/sta
t
us-par
t
ial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge remote branch 'remotes/tra
s
t-doc/f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jh/note
s
' (e
a
rl
y
p
a
rt)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Me
r
g
e branch 'jc/m
a
int-ref
r
esh-index-is-o
p
tional
-
for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ha
m
ano
Fix
"
l
o
g" fa
m
il
y
n
ot t
o
be too agre
s
sive a
b
out showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
M
e
rge branch 'rr/c
o
re-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'jc/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
branch '
j
s/exe
c
-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Mer
g
e branch 'jc/ls-fi
l
es-
i
gnored-pat
h
spec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge bran
c
h 'jc/grep
-
loo
k
a
head'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch
'
j
c/maint-strbuf-add
-
f
ix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Merge bra
n
ch
'm
m
/c
o
nflict
-
advice
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Mer
g
e branch 'da
/
d
i
ffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'mh/rebase-
f
ixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'ns/rebase-a
u
t
o-squas
h
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge branch
'mh/reba
s
e-fixup' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branc
h
'
i
l/pus
h
-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Haman
o
Merg
e
branch 'jk/wa
r
n
-author-c
o
mmi
t
ter-af
t
er-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge br
a
n
ch 'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge
b
r
anch '
t
r/htt
p
-push
-
r
e
f-status'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge branch 'bk/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
r
ge branc
h
's
d
/c
d
-p-sho
w
-to
p
le
v
el'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'jc/
s
ymbol-sta
t
i
c
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
date
.
c: mark
f
ile-local
funct
i
o
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Sync
w
ith 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
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
bra
n
ch
'bg/m
a
int-
r
emo
t
e
-u
p
date-default' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch 'sb/main
t
-octopus' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
M
e
rge branch 'b
g
/
m
a
int-ad
d
-
a
ll-doc' int
o
main
t
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
erge
b
ranch 'maint-1
.
6
.
5' into m
a
in
t
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 Hamano
M
e
rge b
r
anch
'
jk/maint-1
.
6
.
5-rese
t
-hard' i
n
t
o ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge b
r
anch 'tr/main
t
-1
.
6
.
5-bash-pr
o
mpt-sho
w
-
s
ubmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Merge branch 'dp/
m
ain
t
-1
.
6
.
5-fa
s
t
-
import-non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
H
ama
n
o
Merge
b
r
anch 'jm/m
a
int-1
.
6
.
5-gr
e
p-N
U
L
-
te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Teach @{upstre
a
m} syntax
t
o
strbuf_branchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
t
1
5
06: m
o
re
test
fo
r
@{upstream}
s
yntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Fi
x
"c
h
eckout A
.
.
.
" sy
n
on
y
m for "chec
k
out A
.
.
.
H
E
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
st
a
tus:
d
on't requ
i
re the repository to
b
e writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch 'm
a
int-1
.
6
.
4'
i
nto maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
b
r
anch 'maint-1
.
6
.
3
' into
ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
maint-1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Hamano
Merge
c
ommit
'
v1
.
6
.
4
.
4-8-
g
8d
e
6
518
'
into
m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Ha
m
an
o
Fi
x
mis-backpor
t
of t700
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Up
d
a
te draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Up
d
at
e
draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'd
p
/maint-1
.
6
.
5
-
fa
s
t
-impor
t
-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge bra
n
ch '
j
c/r
e
r
e
re'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'pc/un
i
nteresting
-
submodul
e
-d
i
sapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge branch
'
nd
/
inc
l
ud
e
-termios
-
for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge b
r
anch
'
js
/
windows
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
g
e branch 'j
m
/
m
aint-1
.
6
.
5-grep-NUL-ter
m
inate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
ama
n
o
symlinks
.
c:
remo
v
e unus
e
d functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
object
.
c: remove unused
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
Hamano
Docu
m
ent that merge s
t
rategie
s
can no
w
take thei
r
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Make "sub
t
r
ee
"
part more orthogonal to the re
s
t of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
m
ano
pull: Fix p
a
r
s
ing
of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Ha
m
ano
Up
d
ate draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
mano
Me
r
g
e bran
c
h 'tc/test-locate-
h
tt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Merge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jn/
m
akefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Ham
a
n
o
M
e
r
g
e branch 'jc
/
maint
-
1
.
6
.
1-checkout-m-cus
t
om-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
a
m
ano
Mer
g
e b
r
anch '
t
c/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erg
e
branch 'tc/smart-h
t
t
p
-re
s
trict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'j
k
/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'sr/gfi-option
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update C
O
P
Y
ING with GPL
v
2 with new
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
mano
user_ident_suff
i
ciently_gi
v
e
n
(
)
: refact
o
r t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C Hamano
user_ident_sufficiently_given(): r
e
factor
t
h
e logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
rerere: hon
o
r
c
onflict-marker-
s
ize attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
rerere: pre
p
are
f
o
r
c
u
stomizable conflict marker length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::print_summar
y
:
d
o
not
release the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
c
o
nflict-mark
e
r-size: new attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
a
no
r
e
rere: use ll_merge() instead of using xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
merge-t
r
ee: us
e
ll_merge
(
) not xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
xdl
_
merge(): a
l
low
p
as
s
i
ng down marker_size i
n
xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
xdl_merge():
i
ntr
o
duce
xmparam_t for
merge speci
f
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
am
a
no
git_attr
(
): fix function sign
a
t
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
a
m
ano
M
e
rge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Teach
diff that m
o
di
f
ied submodule
d
irector
y
is dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Haman
o
grep --no-inde
x
: all
o
w
u
se
of "
g
it
g
rep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep
:
pre
p
are to
r
un outsid
e
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
/
checkout-me
r
ge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'rs
/
m
a
int-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Merge branch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
aman
o
strbuf_addbuf(): all
o
w
p
a
s
sing the
s
a
me buf to
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hama
n
o
Me
r
ge branch 'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
i
o
C Haman
o
Merg
e
branch 'nd/s
p
arse'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C
Ham
a
no
t7502: test com
m
i
t
.
st
a
tus, -
-
status and
--n
o
-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C H
a
m
a
no
grep:
r
i
p out
pessimization
to use f
i
xmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
gre
p
:
rip out s
u
ppo
r
t for ex
t
ernal grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
M
e
r
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ham
a
no
strbuf
.
c
: remove unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next