repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
conflict-marker-size: add test and docs
2010-01-21
Junio
C
H
a
man
o
conflict-marker-size: a
d
d
test and d
o
cs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Upd
a
t
e
draft release no
t
es to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Me
r
ge
b
ranch 'bw/cvsimpo
r
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merg
e
branch 'jc/
c
hecko
u
t-
m
er
g
e
-
base'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hama
n
o
Me
r
ge bra
n
ch 'ag/
p
atch-heade
r
-verify'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Ha
m
ano
Merge branch 'j
c
/confl
i
ct-marker-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Ham
a
no
Merge branch 'a
g
/ma
i
n
t
-apply-too-large-p
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch '
a
p
/
m
erg
e
-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Hamano
M
e
rge branch 'nd/status-partial-refr
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge
r
e
m
ote bran
c
h 'remotes/t
r
ast-
d
oc/for
-
next'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hama
n
o
Me
r
ge branch 'jh/notes'
(early part)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Haman
o
M
e
rge b
r
anch 'jc/
m
aint-r
e
fresh-index-is-
o
ptio
n
al-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Mer
g
e bran
c
h '
r
r
/
core-tutoria
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branc
h
'jc/cache-unme
r
g
e
'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge
b
ranch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'jc
/
ls-files-ig
n
ored-pa
t
hspec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Me
r
ge b
r
anch 'j
c
/gr
e
p-lookahead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'jc/m
a
int-strbuf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'
mm
/
conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
e
rge branch 'da
/
difft
o
ol'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch
'mh/rebase
-
fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
no
Merge br
a
nch
'
ns
/
rebase-aut
o
-squash
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch
'mh/reba
s
e-fixup' (ear
l
y
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge bra
n
ch
'
i
l
/
p
u
s
h-set-up
s
tream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
b
r
an
c
h
'
j
k/warn-author-c
o
mmitt
e
r-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge b
r
anch '
j
c/id
e
n
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge bran
c
h '
t
r
/http-p
u
s
h
-
r
ef-status
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
bk/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge b
r
anch 'sd/
c
d-p-show-toplev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch
'
jc/symbol-
s
tatic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mar
k
file-loca
l
fun
c
tion st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Sync wi
t
h
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bg/mai
n
t-remote-update-default' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge bra
n
ch 'sb/maint-octopus' i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Me
r
ge
b
ranch
'bg/maint-a
d
d-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Hamano
Merge branch
'maint-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
Ha
m
ano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
M
erge bra
n
c
h
'jk/maint-1
.
6
.
5-reset
-
hard'
i
nt
o
maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
n
o
Merge br
a
nch 'tr/maint-1
.
6
.
5-bash-pr
o
mpt-s
h
o
w
-s
u
bmodul
e
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
e
rge branch 'dp
/
maint-1
.
6
.
5-fa
s
t-i
m
port
-
non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
jm/maint-1
.
6
.
5-
g
re
p
-
N
UL-t
e
rminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
aman
o
Fix "check
o
ut A
.
.
.
" syno
n
ym
for "checkout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
ano
status: don't require th
e
r
epository to
be
w
ritable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
H
amano
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Me
r
ge branch 'maint
-
1
.
6
.
4'
int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Hama
n
o
M
erge branch 'maint-1
.
6
.
3
' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hama
n
o
Merge br
a
n
ch 'm
a
int
-
1
.
6
.
2' into maint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Me
r
ge
c
ommit 'v1
.
6
.
4
.
4-8-g8d
e
65
1
8' into m
a
int-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Ham
a
no
Fix
mis-bac
k
po
r
t of
t
7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Update dr
a
ft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update draft
r
e
le
a
se notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'dp/maint-1
.
6
.
5-fast-im
p
ort-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
H
a
m
ano
M
e
rge branch 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Merge br
a
nch 'pc/uninter
e
sti
n
g-submodule-disa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch
'nd/incl
u
de-termios
-
for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Mer
g
e branch 'jm/m
a
i
n
t
-1
.
6
.
5-grep-NUL-te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hama
n
o
s
ymlinks
.
c: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
object
.
c: re
m
ove unused funct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Document that merge str
a
tegies can now
take
their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
H
a
m
ano
M
a
ke "subtree" p
a
rt more orthogonal
to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Haman
o
pull: Fix
p
arsing of -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
Updat
e
draft rel
e
ase notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Merg
e
br
a
nch 't
c
/
tes
t
-
loc
a
te-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
M
e
rge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge bra
n
c
h 'j
n
/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch 'j
c
/maint-1
.
6
.
1
-checkout-
m
-custom-mer
g
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
n
ch 'tc/smart-http-restr
i
ct'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merg
e
branch '
j
k
/
run-
c
ommand-use-shell
'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
a
m
a
no
M
e
rge branch 'sr/gfi-op
t
io
n
s
'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
U
p
date C
O
PYING
with GPL
v
2
with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_i
d
e
nt_suf
f
icientl
y
_given
(
): refactor
the
lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficientl
y
_giv
e
n(): r
e
factor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
a
no
rerere: ho
n
or c
o
nfl
i
ct-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: pr
e
pa
r
e for cu
s
tomizable conf
l
i
c
t
marker
l
ength
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c:
:
print_summary: do n
o
t r
e
lea
s
e the forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
aman
o
conflict-marker-
s
ize: new attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
Hamano
re
r
ere: use ll_merge
(
) ins
t
ead
o
f usi
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree: use ll_m
e
r
ge() not xdl_m
e
rge(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ha
m
ano
xdl_merge(): allow pass
i
ng
down marker_size in xmparam_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
x
d
l
_
merge(): introduc
e
xmpa
r
am_t f
o
r
merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
git_
a
ttr(
)
: fix function s
i
gnatu
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merg
e
b
ranc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
M
e
rge b
r
anch 'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Ha
m
ano
grep --no-in
d
ex: allow use of "git gr
e
p
" outsi
d
e a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C Haman
o
grep: prep
a
re t
o
run outside of a wor
k
tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Ha
m
ano
Merge branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
man
o
Merge branch 'rs/maint-archive-match
-
pa
t
hspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Mer
g
e branch 'il/
v
c
s
-h
e
lpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
io C Hamano
s
t
rbuf_
a
ddbuf(): all
o
w
passing
t
he same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Haman
o
M
erge
br
a
nch
'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
Merge branch 'nd/s
p
arse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502: test commit
.
s
tatus
,
-
-status
a
n
d --no-st
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip ou
t
pe
s
si
m
ization
to use fix
m
atch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
grep: r
i
p o
u
t
s
u
p
port fo
r
ext
e
rnal grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
next