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 'maint'
2010-01-21
Junio
C Hamano
Merge branch '
a
g/maint-apply-too-l
a
rge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
M
e
r
g
e branch 'ap/merge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge branch 'nd/status-partial-refresh
'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merge remo
t
e br
a
nch
'
r
e
m
o
t
es/trast-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'jh/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ham
a
n
o
Merge
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Ha
m
ano
Merge branch 'jc/maint-refresh-index-is-op
t
i
o
n
al-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
io C Hamano
Fix
"
l
o
g"
f
ami
l
y
not to
b
e to
o
agressive abo
u
t sho
w
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Hamano
Merge branch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge br
a
nch 'j
c
/cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
r
ge branch '
j
s/exec-error-report
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
ano
Merge bran
c
h 'jc/ls-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
a
m
ano
Merg
e
branch 'jc
/
grep-lookah
e
ad
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Me
r
g
e branch
'
j
c
/
ma
i
n
t-strbuf-a
d
d-fix-
d
oubli
n
g'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'm
m
/conflic
t
-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch 'da/diffto
o
l'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
M
erge branch 'mh/r
e
base-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge b
r
anc
h
'n
s
/re
b
ase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge b
r
a
nch
'
m
h
/reba
s
e-fix
u
p' (early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'i
l
/push-
s
e
t-upst
r
eam'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
a
nch 'jk
/
w
arn-author-co
m
m
it
t
e
r
-a
f
ter-c
o
mmit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge branch
'
jc/ide
n
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch '
t
r/http
-
push-ref-s
t
at
u
s'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Ham
a
no
Mer
g
e br
a
n
c
h 'bk/fix-relative
-
gitdi
r
-
file'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge br
a
nch 'sd
/
c
d
-
p
-show-t
o
pl
e
v
e
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge branch 'jc/symbol
-
st
a
t
ic'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hama
n
o
dat
e
.
c: ma
r
k
file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io 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
Hamano
Git
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C
Haman
o
Merg
e
b
r
anch
'bg/maint
-
remote-update
-
default' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge
branch 'sb/mai
n
t-oct
o
pus'
into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Mer
g
e branch 'bg/maint-add-all-doc' into
maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
H
a
mano
Me
r
ge branch 'maint-1
.
6
.
5
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'jk
/
main
t
-1
.
6
.
5-res
e
t-hard' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Haman
o
M
erge bra
n
ch 'tr/mai
n
t-1
.
6
.
5-bash
-
p
r
o
m
pt-sho
w
-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C H
a
mano
Merge
b
r
anch
'
dp/ma
i
n
t
-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hama
n
o
Merge branch
'
jm/maint-1
.
6
.
5-grep-NUL-termin
a
t
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
T
e
a
ch @{upstream} synt
a
x t
o
strbuf_bran
c
hanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Ha
m
a
no
t
1506: more test f
o
r
@{u
p
s
t
ream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Fix "c
h
ecko
u
t A
.
.
.
" synonym
f
or
"
checkout
A
.
.
.
H
EAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status: don't
r
e
quire the repos
i
tor
y
to be
w
ritable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hamano
Merge br
a
nch 'maint
-
1
.
6
.
3
'
in
t
o m
a
int-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'ma
i
n
t-1
.
6
.
2' into m
a
int
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hama
n
o
Merge commi
t
'v1
.
6
.
4
.
4-8-g
8
de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
Hamano
Fix mis-backport o
f
t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
p
date draft rele
a
se
n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Update
d
raft
r
e
lease notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hama
n
o
Me
r
g
e branch 'dp/ma
i
nt-1
.
6
.
5-f
a
st-impor
t
-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge br
a
nch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Me
r
ge
b
ranch 'pc/unintere
s
ting-sub
m
od
u
le-disapp
e
ar
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C
H
amano
M
e
rge bra
n
ch 'nd/in
c
lude-term
i
os-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'j
m
/maint-1
.
6
.
5-grep-NUL-terminate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
sym
l
inks
.
c:
r
emove
unu
s
ed
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
Hamano
object
.
c
: remove u
n
used fun
c
tio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
Do
c
ument that merge strategies can now take th
e
ir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o
C Ha
m
ano
Make
"subtree" p
a
rt more
o
r
thogon
a
l to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
pull: Fix parsin
g
of
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Update draft
release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o C Hamano
M
erge bra
n
ch 'tc/te
s
t-
l
o
c
a
t
e-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch
'jh/commit
-
status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge bran
c
h '
j
n/
m
akef
i
le'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
e
rge branch 'jc
/
m
aint-
1
.
6
.
1
-
c
heckout-
m
-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
Merge branch
'
tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge b
r
anc
h
'tc/
s
mart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge branch 'jk/run-command-us
e
-
s
h
e
ll
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
ni
o
C H
a
man
o
M
e
r
g
e branc
h
'sr/
g
fi-options'
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
U
p
date COPYING with
GPLv2 with new FSF a
d
d
r
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_ident
_
sufficiently_giv
e
n(
)
: refactor the lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Haman
o
u
s
e
r
_ident_sufficiently_given():
r
e
f
acto
r
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
ma
n
o
rerere: ho
n
or conflict-ma
r
ker
-
s
i
ze at
t
rib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ha
m
ano
r
erere: prepar
e
f
or customizable con
f
lic
t
marker
length
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c
::pri
n
t
_
sum
m
ar
y
: do not rel
e
ase the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
confl
i
ct-marker-si
z
e:
new
a
tt
r
ibute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
rerere: use ll_m
e
r
g
e() instead of using xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
merge
-
tree: use ll_merge() not xdl_me
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merg
e
()
:
allo
w
pa
s
sing
do
w
n marke
r
_si
z
e
i
n xmpara
m
_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
x
dl_mer
g
e(
)
:
i
n
t
r
oduce xmp
a
ram_t for mer
g
e specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
git_attr():
f
ix fun
c
tion signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
e
r
ge
b
r
an
c
h 'cc/reset-m
o
re'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
Te
a
ch dif
f
that modifi
e
d su
b
m
odule
d
ire
c
tory 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
J
u
n
io C Ha
m
ano
grep --no
-
in
d
ex: allow use
o
f "
g
it grep" outs
i
de a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C Hamano
grep: prepare to run
o
utside of a work tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hamano
M
e
rge bra
n
ch 'jc/checkou
t
-merge
-
b
a
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
M
e
r
ge bra
n
c
h
'rs/maint
-
archi
v
e-match-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
Merge branch 'il/vc
s
-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
s
t
r
buf
_
a
ddb
u
f(): allow passin
g
the same b
u
f to ds
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge bra
n
ch 'cc/r
e
set-mor
e
'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io
C
H
a
m
ano
Me
r
ge
b
ranc
h
'
nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502: test commit
.
stat
u
s, --status and --no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
grep: rip out pessimization to u
s
e fix
m
atch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hama
n
o
gr
e
p
:
ri
p
out
sup
p
ort for external
g
rep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
Me
r
ge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
s
trbuf
.
c: remove unus
e
d fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
sha1_
f
ile
.
c: re
m
ove u
n
used
f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next