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/checkout-merge-base'
2010-01-21
Ju
n
i
o
C Hamano
Merge branch 'jc/checkout-merge-base
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'ag/patch-header-
v
erify
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch 'j
c
/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h
'
ag/ma
i
nt-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch 'a
p
/merge-bac
k
end-o
p
ts'
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C Hamano
Merge branch
'nd/statu
s
-
partial-re
f
resh'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hamano
M
erg
e
remote branch
'
r
emot
e
s/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
r
ge branch '
j
h/notes'
(
early
p
art)
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merg
e
b
ran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Merg
e
b
ranch 'jc/maint-refresh-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
erge branch 'rr
/
c
o
r
e
-tuto
r
ial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
M
e
r
g
e
b
ran
c
h 'jc/cache
-
unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
g
e
b
r
anch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'jc/ls-files-
i
gnored-
p
at
h
spec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Me
r
ge bra
n
ch 'jc/grep
-
lo
o
kahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
ge bra
n
ch 'jc/maint-strb
u
f-add
-
fix-
d
o
ub
l
in
g
'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Haman
o
Merge b
r
a
n
ch 'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge
b
ranch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
an
o
Merge branch 'mh/rebase-
f
ixup
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
M
e
rge branch 'ns/rebase-auto-
s
q
u
a
sh'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
e
rge bran
c
h 'mh/rebase-f
i
xup' (early p
a
r
t
)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Merg
e
branch 'il/push-set-
u
pstream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Ham
a
no
Merge
b
ranch 'jk/warn-a
u
t
h
or-commit
t
er-af
t
e
r
-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge br
a
nc
h
'
j
c
/iden
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'tr/http-p
u
sh-ref-sta
t
us
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
b
ranch '
b
k/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge branch 'sd/cd-p-sho
w
-toplev
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
erg
e
br
a
nch 'jc
/
symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
da
t
e
.
c: mark file-local function
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
an
o
Sync w
i
th 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
M
erge bra
n
c
h 'bg/
m
ai
n
t-
r
emote-update-default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Ham
a
no
Merge bra
n
ch 'sb/m
a
int-octop
u
s' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge b
r
anch 'bg/mai
n
t-add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branc
h
'maint-1
.
6
.
5' into maint
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 Hamano
Merge
b
ran
c
h 'jk
/
m
a
i
n
t-1
.
6
.
5-
r
eset-ha
r
d'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
M
e
rg
e
branch 'tr/maint-1
.
6
.
5
-bash-prompt-sh
o
w-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Hamano
Merge branch 'dp/m
a
in
t
-1
.
6
.
5-fast-im
p
ort-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e
branc
h
'
jm/m
a
int-1
.
6
.
5-grep-NUL-termina
t
e'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Fix "checkout A
.
.
.
" syno
n
ym
f
o
r
"checkout
A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C H
a
mano
s
tatus: don't require the repo
s
itor
y
to be writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Ham
a
n
o
Me
r
ge
b
ran
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io
C Hamano
Me
r
ge bran
c
h 'maint-1
.
6
.
4' into
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
ge br
a
nch 'main
t
-1
.
6
.
3
'
into m
a
i
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'maint-1
.
6
.
2' into mai
n
t-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Me
r
ge com
m
it 'v1
.
6
.
4
.
4-8-g8de6518' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
F
i
x mis
-
backp
o
r
t of
t
7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
H
amano
Upda
t
e
d
raft release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
erge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Update draft
r
ele
a
s
e
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 Hamano
Merge branch 'dp/maint
-
1
.
6
.
5-
f
ast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge bran
c
h
'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
erge branch '
p
c/u
n
interesting-s
u
bmod
u
le-disappea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch 'nd/include
-
termios-
f
or-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
j
s/wi
n
dows'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge bran
c
h 'jm/maint-1
.
6
.
5
-
grep-NU
L
-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hama
n
o
s
ymlin
k
s
.
c: remove
unus
e
d func
t
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C Hamano
obj
e
ct
.
c:
re
m
ove
unused func
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that merg
e
stra
t
eg
i
e
s
can now take
t
h
e
ir own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Make "s
u
btree" part more ort
h
ogonal
to th
e
r
est of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C Hamano
pull: F
i
x parsi
n
g of -X
<
option
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
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 Haman
o
Merge b
r
an
c
h 'tc/test-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
Ha
m
ano
Merge branc
h
'jh/commit
-
status'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
Merge branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
b
ranch '
j
c/
m
ain
t
-
1
.
6
.
1-checkout-m-custom-
m
erge
'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Ham
a
no
Merge branch
'
tc/clone-
v
-
progress
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/smart-http-re
s
t
r
i
c
t'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Mer
g
e branch
'jk/r
u
n
-
command-
u
se-shell
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge b
r
anch 'sr/g
f
i
-options'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Haman
o
Update COP
Y
ING with
GPLv2 with n
e
w FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
u
ser_ident_sufficiently_given
(
): refact
o
r th
e
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
use
r
_ident_sufficie
n
t
l
y_given
(
): ref
a
ctor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor conflict-ma
r
ker-size attribut
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
i
o C Ham
a
no
re
r
ere
:
prepare f
o
r customizable conflic
t
marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
amano
commit
.
c::print_summary: do not releas
e
t
h
e fo
r
mat
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
conflict-marker-size: new a
t
tr
i
bute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
rerere: use ll_merge(
)
i
n
stead 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
ree: use
l
l_merge() n
o
t xdl_m
e
rge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
xdl_merge(): a
l
l
ow passing
d
ow
n
m
ark
e
r_size
i
n xmp
a
r
am_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Ham
a
no
xdl_merge(
)
: intr
o
d
u
ce xmparam_
t
for mer
g
e
s
pecif
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
an
o
git_attr(): fix
f
uncti
o
n si
g
nature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
M
er
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge
b
ranch '
c
c/reset-mor
e
'
commit
|
commitdiff
|
tree
2010-01-15
Junio C H
a
mano
gr
e
p --
n
o-index:
allow use of
"
gi
t
grep"
o
utside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
gr
e
p
: prepare to run outside of a wo
r
k tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge bra
n
c
h
'jc/ch
e
ckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
Merge b
r
anc
h
'
rs/maint-arc
h
ive-mat
c
h-
p
athspe
c
'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C
H
ama
n
o
Merge
b
ranch 'il/vcs-he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
s
trb
u
f_addbuf():
a
llow passing the sa
m
e
b
uf to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
Merge branch 'cc/re
s
et-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
Merge branch 'n
d
/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
t
7
502:
t
est commit
.
status, --statu
s
and
--no-st
a
tus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out
p
essimi
z
ation
to use f
i
x
m
atch
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C H
a
mano
g
rep: rip out support
for external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hama
n
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C H
a
mano
strbuf
.
c
:
remove unu
s
ed function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io
C Ha
m
ano
sha1_file
.
c
:
remove unused fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Haman
o
mailmap
.
c:
remove unu
s
ed function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next