repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Remove diff machinery dependency from read-cache
2010-01-22
Linus Torvalds
Rem
o
ve dif
f
m
achinery
d
e
pendency from r
e
a
d-cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Horst H
.
von Brand
gi
t
-rebase
.
txt: Fix
s
pelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
ohannes
S
ixt
Ma
k
e 're
r
ere
forget' wor
k
f
rom a subdirectory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Si
x
t
Make
test case numbers unique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
c
onf
l
ict-marker-
s
ize:
a
dd test and
docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Update draft release notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge br
a
n
c
h 'bw/
c
vsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e branch 'j
c
/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
M
e
rge branc
h
'ag/patc
h
-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge b
r
an
c
h 'jc/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Ha
m
ano
Merge branch 'ag/maint-apply-
t
oo-
l
arge-
p
'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C Ha
m
ano
M
erge b
r
anch 'ap/m
e
r
g
e
-backend-
o
pt
s
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
Ham
a
no
Me
r
ge branc
h
'nd/s
t
atus-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hama
n
o
Merge remote branch 'remotes/
t
ras
t
-doc/
f
or
-
next'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
H
am
a
no
M
erge
b
ranc
h
'jh/notes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Hamano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
Hamano
Merge bra
n
ch
'
j
c
/maint-refresh-index-
i
s-o
p
tional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
bran
c
h
'rr/c
o
re-
t
u
t
orial'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
M
e
rge branch 'jc/cache-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hama
n
o
Merge branch 'js/exec-e
r
ror-repo
r
t'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rg
e
branch 'jc/l
s
-f
i
les-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'j
c
/gr
e
p-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Ha
m
a
no
Merge branch 'j
c
/ma
i
nt-st
r
b
uf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
br
a
nch 'mm/co
n
f
l
ict-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Me
r
ge br
a
nc
h
'da/
d
ifftool'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge b
r
a
n
c
h 'mh/reb
a
se-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'ns/
r
e
base-
a
uto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
branch
'mh/rebase-
f
ixup'
(
e
arly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge bran
c
h
'
il/push
-
set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge branch
'
jk/warn-author-committe
r
-aft
e
r-co
m
m
it
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge br
a
nch 'jc/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge
b
ranch 'tr/htt
p
-push-re
f
-status'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch '
b
k/fix-relative-gitdir
-
file'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
man
o
Merg
e
branch 'sd/
c
d-p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
M
e
rge branch 'jc/symbo
l
-
static'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Ham
a
no
date
.
c: mark file-local fu
n
ction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Sync with 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
Junio
C
H
a
mano
Merge branc
h
'bg/mai
n
t-remote-update-def
a
ult' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
M
er
g
e
b
ranch
'
sb/maint-octopus'
into
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
anch 'bg
/
maint
-
add-all-
d
oc' into
m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
rge
b
ranch '
m
aint
-
1
.
6
.
5' into m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
b
ran
c
h
'
jk/m
a
int-1
.
6
.
5
-r
e
set-ha
r
d
'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge b
r
a
n
ch 'tr/maint-1
.
6
.
5-bash-prompt-
s
h
ow-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'dp/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Merge
br
a
nch 'jm/main
t
-
1
.
6
.
5-grep
-
NUL
-
t
e
r
min
a
te' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Fix "checkout A
.
.
.
" synonym for "che
c
k
o
ut
A
.
.
.
H
E
AD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
status: don't require the
repositor
y
to b
e
writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
J
ohannes S
i
xt
M
akefile: honor NO_
C
URL
w
hen setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Case
b
olt
ide
n
t
.
c
:
re
p
lace fpri
n
tf with
fputs to suppr
e
ss
c
ompil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái
Ngọc
D
uy
rm: only refres
h
e
n
tries that we
may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bise
c
t
: fix singular/plur
a
l gramm
a
r
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
i
m
port: s
t
a
nda
r
ize system() c
a
lls to ext
e
rnal g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cv
s
impor
t
: standari
z
e
o
pen() calls to external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsim
p
o
r
t: moderniz
e
cal
l
outs to git su
b
c
o
mmands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Ham
a
no
Mer
g
e
branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bran
c
h
'maint-
1
.
6
.
3' into
maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Me
r
ge branch 'maint-1
.
6
.
2' i
n
t
o maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Merg
e
com
m
it 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ham
a
no
F
i
x
mis-
b
a
ckpo
r
t
of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
mano
Upda
t
e
draft relea
s
e notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hama
n
o
Update dr
a
ft r
e
leas
e
no
t
es to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'dp/maint-1
.
6
.
5-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C H
a
mano
Merge branch
'jc/
r
erer
e
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Ham
a
no
Merg
e
b
r
anch 'p
c
/un
i
nteresting-submodule-d
i
sappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Ham
a
no
Merg
e
branch 'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge bra
n
c
h 'js/windo
w
s'
commit
|
commitdiff
|
tree
2010-01-19
A
ndreas Gruenbacher
b
uiltin-apply
.
c: fix the --- and +++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Bar
k
alow
Re
p
lac
e
parse_bl
o
b()
w
i
th an explanato
r
y c
o
mm
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jm/maint-
1
.
6
.
5
-gr
e
p
-
N
UL-
t
erminate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
i
m
Meyering
grep: NUL terminate input fro
m
a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenbacher
buil
t
in-app
l
y
.
c: Skip filenames without enough component
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c:
remo
v
e
u
n
use
d
f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
bject
.
c: rem
o
ve unused function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Doc
u
ment that merge strat
e
gies c
a
n
now tak
e
t
heir o
w
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pe
n
narun
E
x
tend merge
-
subtree tests t
o
test -X
s
ubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
i
o C Hamano
Mak
e
"subt
r
ee" part more orthogonal to the rest
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
pul
l
:
Fi
x
parsing
of -X<op
t
io
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
T
each gi
t
-pull to
p
a
ss -X<option
>
t
o
git
-
me
r
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pe
n
narun
git me
r
g
e -X
<
opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Update draft r
e
lease 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
M
e
rge branch 'tc/test-loca
t
e-ht
t
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
a
no
Merge branch
'jh
/
commit-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merg
e
bran
c
h 'jn/
m
akefile'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
a
m
ano
Merge branch
'jc/
m
aint-1
.
6
.
1-checkout-
m
-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/c
l
one-v
-
p
r
ogress
'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C Hamano
Merge branch
'tc
/
smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hamano
Merge branch 'jk/run-comma
n
d-
u
se-s
h
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge
branch
'sr/gf
i
-option
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Update COPYING
with G
P
Lv2 with new FS
F
add
r
e
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
user_ident_sufficien
t
l
y_given(): refac
t
o
r
the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
user_ident_
s
ufficient
l
y
_
g
iven(): refac
t
or the
logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C Hamano
rerere: ho
n
or
c
o
nfl
i
ct
-
m
a
rker-siz
e
a
tt
r
ib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
rerere
:
pre
p
are for customizable c
o
nflict marker
length
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 rel
e
a
s
e
the for
m
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
ma
n
o
con
f
lict-
m
arker-size: new a
t
t
ribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use
ll_me
r
ge() in
s
tead of
u
si
n
g xdl_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next