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
conflict-marker-size: add test and docs
2010-01-21
Juni
o
C Hamano
conflict-ma
r
k
er-siz
e
: add test a
n
d docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Upd
a
t
e
d
r
a
ft re
l
ea
s
e
notes
t
o 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
M
e
rge bra
n
ch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Me
r
ge branch '
j
c/checkou
t
-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merg
e
b
r
an
c
h
'ag/patch-
h
eader-
v
e
rify'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ha
m
ano
Merg
e
br
a
nc
h
'
j
c
/
c
onfli
c
t-marke
r
-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merg
e
branch 'ag/maint-apply-
t
oo-la
r
g
e
-p'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Hamano
M
erge branch 'ap
/
merge-
b
a
c
k
e
n
d-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merg
e
branch '
n
d/status
-
partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge remote bra
n
ch 'remotes
/
trast-doc/for-n
e
xt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
M
e
rge
branch 'jh/
n
otes' (
e
a
r
l
y
p
art)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
Hamano
Merge bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C
H
amano
Me
r
ge branch 'jc/main
t
-refresh-i
n
d
ex-i
s
-
optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
b
ran
c
h 'rr
/
co
r
e-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ha
m
ano
Merge branch 'jc
/
c
a
che-u
n
merge'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge b
r
anch 'j
s
/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Haman
o
Merge
bran
c
h '
j
c/ls-fil
e
s-i
g
nored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
e
rge branch 'jc/grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'jc/mai
n
t-
s
trbuf-add-fix-dou
b
ling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge br
a
nch 'mm/c
o
nflict-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge
branc
h
'
da/d
i
fftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branc
h
'
m
h
/
rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'ns
/
reba
s
e-aut
o
-squas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branch 'mh
/
rebas
e
-fixup' (
e
a
rly p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Me
r
ge branch
'
il/push-s
e
t-ups
t
ream'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
M
e
rge branch 'jk/warn-
a
uthor-com
m
itter-after-comm
i
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge
b
r
anch 'j
c
/
ident'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Merge branch 't
r
/htt
p
-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
branch 'bk/fix-relative-gitd
i
r
-
file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Merge branch 'sd/cd-p-show-toplev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erg
e
branch 'jc/symbol-stat
i
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
da
t
e
.
c: mark f
i
le-local func
t
ion static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
ano
Syn
c
w
i
th 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C
Hamano
Git
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Merge branch 'bg/mai
n
t-remote-update-default' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
g
e
b
ranch 'sb/maint
-
oc
t
opus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch '
b
g
/maint-add-all-doc' in
t
o maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'main
t
-1
.
6
.
5' into main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
G
it
1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Haman
o
Merge b
r
anch 'jk/ma
i
nt-1
.
6
.
5-
r
eset-har
d
' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merg
e
b
r
anch 'tr/maint-1
.
6
.
5-b
a
sh-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'
d
p
/main
t
-1
.
6
.
5
-
fas
t
-im
p
ort-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
r
g
e
branch 'jm/maint-1
.
6
.
5-g
r
e
p-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C Hama
n
o
Fi
x
"checkout A
.
.
.
"
sy
n
o
nym for "checkout A
.
.
.
HEA
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
s
t
a
tus: do
n
't require the re
p
ository to b
e
writable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge
bran
c
h '
m
a
int-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C Ham
a
no
Merge branch 'maint-1
.
6
.
3' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Merge bra
n
ch 'maint-1
.
6
.
2
'
int
o
maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C
Hamano
M
erge commit
'
v
1
.
6
.
4
.
4
-
8
-
g8de6518'
i
nto ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Fix mis-ba
c
kport of t7002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C Ha
m
ano
U
pdate 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
M
e
rg
e
branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft
rele
a
se notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Mer
g
e branch 'dp/maint-1
.
6
.
5-fa
s
t-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Ham
a
no
Me
r
ge branch 'jc/rerer
e
'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
Merge branch
'
pc/uninteresting-subm
o
dule-
d
isapp
e
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Me
r
ge branch 'nd/in
c
lud
e
-te
r
mios
-
for-osol'
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Hamano
Merge
b
ranch 'j
s
/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o C H
a
mano
Merge branch
'jm/maint-1
.
6
.
5-grep-NUL-termin
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
symlinks
.
c: r
e
move unused functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
object
.
c: remove unused f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C Hamano
D
o
c
ument
that
merge strategie
s
c
an no
w
take their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
Make
"
subtree" part m
o
re o
r
tho
g
o
n
a
l t
o
the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: F
i
x parsin
g
of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Upda
t
e dra
f
t release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
Hamano
Merge branch
'tc/te
s
t-locate-
h
ttp
d
'
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C Hamano
Merge
bra
n
ch 'jh/
c
ommit-statu
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e br
a
nch 'jc/maint-1
.
6
.
1
-checkout-m-c
u
stom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branc
h
'tc/
c
lo
n
e-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
br
a
nch '
t
c/sm
a
rt
-
http-restrict
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge branch 'jk/run-command-use-she
l
l'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Haman
o
Merge bran
c
h
'sr/gfi-
o
p
t
ions'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
Upd
a
te
COPYING wit
h
GP
L
v2 wi
t
h
n
ew FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
user_iden
t
_
sufficiently_given
(
): re
f
actor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hama
n
o
user_ide
n
t_sufficiently_given
(
): refactor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor conflic
t
-m
a
rker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
Ham
a
no
rerer
e
: pre
p
ar
e
for customizable
c
onflict
m
ark
e
r length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
c
o
mmit
.
c::print_summary: do not release
t
he format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
c
o
nflict-ma
r
k
e
r-size: ne
w
a
t
tribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerer
e
:
u
se
l
l_mer
g
e() instead of using x
d
l
_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Haman
o
m
e
r
ge-
t
ree: use ll_me
r
ge() not
xdl_me
r
ge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): allow passing d
o
wn
m
arker_
s
ize in xmpara
m
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
xdl_merge
(
)
:
i
ntro
d
u
ce
x
mpa
r
a
m
_t for
m
erge specif
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
g
i
t_a
t
tr
(
): f
i
x
functi
o
n
s
i
g
nature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge bran
c
h 'cc/reset-more
'
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ha
m
ano
grep --no-ind
e
x
: all
o
w use of
"
git grep"
o
u
t
side a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
g
r
ep: prepare to
r
un outside of a work tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge
bran
c
h 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Ham
a
no
M
erge
b
ranch
'rs/maint
-
a
r
c
h
ive-match-pathspec
'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Haman
o
Merg
e
b
r
anch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Haman
o
s
t
rbuf_addbuf(): all
o
w passing th
e
same buf to ds
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Ham
a
no
Mer
g
e bra
n
ch '
c
c
/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Haman
o
Merge b
r
an
c
h 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
t750
2
: test commit
.
status, --
s
tatus and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Ham
a
no
grep: rip out
pessimization to
u
se
fi
x
match()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o C Hamano
grep: rip out suppo
r
t for
extern
a
l grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
am
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
next