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
Merge branch 'jc/conflict-marker-size'
2010-01-21
Junio C Hamano
Merge branch 'jc/c
o
nflict-m
a
r
ke
r
-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
no
Me
r
g
e
br
a
n
c
h
'ag/ma
i
n
t-appl
y
-too-large-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branc
h
'
a
p/mer
g
e-b
a
ckend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge br
a
n
ch '
n
d
/
stat
u
s-partial-re
f
resh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Me
r
ge remote branch 'remote
s
/trast-doc
/
for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
no
Me
r
ge branch 'jh/n
o
tes' (ear
l
y p
a
rt)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
b
ran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge
branch 'jc/maint-refresh-in
d
ex-is-optional-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge bra
n
ch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
Merge
b
r
a
nch
'jc/cache-unme
r
ge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge br
a
n
ch 'js/exec-error-rep
o
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Merg
e
branch 'jc/ls-fi
l
es-ign
o
re
d
-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Mer
g
e branch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge branch 'jc/maint-strbuf-add-fix-do
u
blin
g
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
n
o
Merge branch 'mm/conflict-advice'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Haman
o
Merge branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Hamano
Merge
bran
c
h 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'ns/rebase
-
auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
an
o
Merg
e
branch 'mh/reb
a
se-fixu
p
' (early p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
H
amano
Merge bra
n
ch 'il/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Me
r
ge branch 'jk/warn-aut
h
or-commit
t
er-af
t
e
r-co
m
mi
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rg
e
branch 'jc/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch 'tr/ht
t
p-push-
r
ef-st
a
t
u
s'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch
'
bk
/
f
i
x
-
rel
a
tive-gitdir
-
file'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
aman
o
M
e
rge
b
ranch 'sd/cd-p-show-toplevel
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Hamano
date
.
c: mark file
-
local fu
n
c
t
ion static
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
Ju
n
io C H
a
mano
G
it 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'bg/maint-remote-update-default' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ha
m
ano
Merge branch 'sb/m
a
int-octopus' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merg
e
branch 'bg/maint
-
add-all
-
doc
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge br
a
nch
'maint-1
.
6
.
5'
into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Git
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hama
n
o
Merge
br
a
nc
h
'j
k
/mai
n
t-1
.
6
.
5-reset-ha
r
d' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
a
n
o
M
erge branch 'tr/ma
i
nt-
1
.
6
.
5-bash-p
r
om
p
t-show-subm
o
dule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
ge b
r
anch '
d
p/maint-1
.
6
.
5-fast-i
m
port-n
o
n-
c
ommi
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C
Hamano
Merge
branch 'jm
/
maint
-
1
.
6
.
5-grep-NUL-
t
erminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
s
tatus:
d
on't require t
h
e reposi
t
ory t
o
b
e writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
a
no
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
erge branch
'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branc
h
'maint-1
.
6
.
3' into
m
aint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge bran
c
h 'maint
-
1
.
6
.
2
'
into m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge c
o
mmit 'v1
.
6
.
4
.
4-
8
-g8de
6
518'
into
maint-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Fix mis-backport of
t
7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
amano
Updat
e
d
raft relea
s
e
notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
H
a
m
ano
Update
d
raft r
e
l
ease
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
/mai
n
t-1
.
6
.
5-fas
t
-impor
t
-non-c
o
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'jc/rerer
e
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'pc/unin
t
eresting-submo
d
ule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge branch 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
er
g
e b
r
anch 'j
s
/wi
n
dows'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Merge
b
ranch 'jm/main
t
-
1
.
6
.
5-g
r
ep-
N
U
L
-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
syml
i
nks
.
c
: remove unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
obj
e
ct
.
c
:
r
emove
unus
e
d function
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
D
o
c
ument that merge strate
g
i
e
s can
n
o
w take t
h
e
ir ow
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Ham
a
no
Make "subtree" part mor
e
orthogonal to the
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix
pars
i
ng o
f
-
X
<
option
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
an
o
Update draft releas
e
note
s
to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C Hamano
M
er
g
e
branch
'
tc/test
-
locate-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
an
o
Merge branch 'jh/
c
ommit-
s
tat
u
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
Me
r
g
e bran
c
h 'jn
/
makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
am
a
no
Merge
b
ranch 'jc/maint-1
.
6
.
1-ch
e
ckou
t
-m-c
u
st
o
m
-m
e
rge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
aman
o
Merge branch 'tc/clone-v-progress
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C H
a
mano
Merge branch 'tc/smart-h
t
t
p
-r
e
strict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
M
e
rge bra
n
ch 'jk/run-c
o
mmand-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Mer
g
e branch 'sr/g
f
i-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPY
I
N
G
with
GPLv2 with
n
ew F
S
F address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
Ham
a
no
user_id
e
n
t_s
u
fficiently_
g
iven(): refa
c
to
r
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
us
e
r_ident_sufficiently_given(): refactor
the
logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: hon
o
r conflict-m
a
r
k
er
-
size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rerere: prepare for c
u
s
t
o
miza
b
le conflict marker
l
en
g
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
commit
.
c
::print
_
summar
y
:
d
o not rel
e
ase
t
he for
m
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C Hamano
conflict-marker-si
z
e: new at
t
ribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
rerere: use ll
_
merge()
i
nstea
d
of
u
sing xdl_merg
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
me
r
ge-tree: use ll
_
merge() not xdl_m
e
rge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
x
dl_merge(
)
: a
l
low
passi
n
g do
w
n marker_size i
n
x
m
pa
r
am_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Haman
o
xdl_merge(): introduce
x
mparam_t for merge
speci
f
ic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
git_attr(): fix function signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc
/
r
e
s
e
t-mor
e
'
commit
|
commitdiff
|
tree
2010-01-15
J
u
n
i
o
C Ham
a
no
grep --no-i
n
de
x
: allow use of "g
i
t grep" outsi
d
e a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Hamano
grep:
prepare to run outside of a wor
k
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Mer
g
e branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Haman
o
Merge branch 'rs/maint
-
a
r
c
hive-ma
t
ch-paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C H
a
man
o
Merge
branch 'il/vcs-he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
str
b
uf_add
b
u
f(): allow passing
t
he same buf to d
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
Merg
e
branch 'cc/res
e
t-
m
ore'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Hamano
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
t
7502: test com
m
it
.
status, --sta
t
us and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hama
n
o
grep: rip o
u
t pe
s
simization to use fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
am
a
n
o
gr
e
p: rip out s
u
pport
f
o
r external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Me
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
s
trbuf
.
c
: remove unuse
d
f
uncti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
s
h
a
1_
f
ile
.
c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
mailmap
.
c:
remove
u
nused
f
unctio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
ut
f
8
.
c: mark file
-
local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
submodule
.
c: mark file-lo
c
al function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
io
C
Hamano
quo
t
e
.
c: m
a
r
k
file-local function
s
tati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next