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
Make difftool.prompt fall back to mergetool.prompt
2010-01-22
Sebast
i
an Schuberth
Ma
k
e difftool
.
prompt fall back t
o
mergetool
.
prom
p
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ramsay
Jones
engine
.
pl: Fix a
recent
br
e
akage
of the
bu
i
ldsystem
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C H
a
mano
git-mv: fix moving more
tha
n
one source to a s
i
n
gle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Michael Ha
g
gerty
rebase -i: Enc
l
ose sed command sub
s
titution in q
u
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Michael Ha
g
gerty
rebas
e
-i:
A
void non-portabl
e
"
tes
t
X
-a Y"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "index-pack"
a
b
uilt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
i
nus Torvalds
mak
e
"git p
a
ck-redundant" a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
i
nus To
r
vald
s
make "git u
n
p
ack-fil
e
" a
b
uilt
-
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linu
s
To
r
v
a
l
d
s
mak
e
"mktag" a built
-
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Li
n
us Torvalds
make "merge-index" a built
-
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Johannes
S
ixt
merge
-
t
ree: remove
u
nnecessary call of git_extract_argv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus
T
orvalds
mak
e
"git pa
t
ch-i
d
" a built
-
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus
Torvalds
m
a
ke
"
git
var" a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Nicol
a
s Pi
t
r
e
fix
git-p4 ed
i
to
r
invocatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Ha
m
a
no
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-22
L
inus Torv
a
lds
make "git h
a
s
h
-
ob
j
e
ct" a b
u
ilt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
inus T
o
rvalds
make "
g
it merge-tree
"
a
built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus
T
orvalds
slim
d
own "git sh
o
w-index"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
Remove diff machinery depend
e
ncy f
r
om read
-
cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Ha
m
ano
merge-rec
u
rsive: do not return
N
U
L
L only to c
a
use segf
a
ult
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
pellin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Tay Ray Chua
n
retry
r
equest without
q
u
e
ry when info/refs?que
r
y fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johanne
s
Sixt
Make 're
r
ere forget' work from
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jo
h
annes
S
i
xt
Make test
c
ase numbers unique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
conflict-marker-si
z
e:
ad
d
test
a
nd docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
U
pda
t
e
draf
t
rele
a
s
e
notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hama
n
o
Merge
branch 'bw/cvs
i
m
p
ort'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hama
n
o
Merg
e
b
r
anch
'
ag/patch-
h
eade
r
-verify'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Merg
e
branch 'jc
/
con
f
l
i
c
t
-marke
r
-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge
b
r
a
n
c
h 'ag/
m
ai
n
t-apply-too-large-p
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge
b
r
a
n
ch 'ap/merge-bac
k
end-opts'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
Merge bran
c
h 'nd/stat
u
s-partial-re
f
resh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
M
erge remote br
a
nch 'remo
t
e
s/tras
t
-doc/f
o
r-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
ano
M
erg
e
branch 'jh/notes' (early
p
a
r
t)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
H
a
mano
M
e
rge
b
ran
c
h 'jc/ma
i
nt-ref
r
esh-
i
nde
x
-i
s
-opti
o
nal-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Ham
a
no
M
erge bran
c
h 'rr
/
c
o
re-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Haman
o
Merge br
a
n
c
h
'
j
c/c
a
c
he-unm
e
rge'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branc
h
'js/exe
c
-error-re
p
ort
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
m
ano
Merge branch
'jc/l
s
-fi
l
es-ig
n
ored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Hamano
Merg
e
branch 'jc/gre
p
-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jc/maint-st
r
buf-add-fix-d
o
ubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch
'mm/conflict-adv
i
c
e'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
erge branch 'da/
d
if
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ra
n
ch
'mh/re
b
ase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
M
e
rge bran
c
h 'ns
/
rebase-
a
uto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'mh/rebase-fixup'
(ea
r
ly par
t
)
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Merge branch 'i
l
/push-se
t
-
u
p
s
tream'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Me
r
g
e b
r
an
c
h 'j
k
/warn-author-committer-after-commit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge
b
r
anch 'jc
/
i
d
ent'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rg
e
branch 't
r
/
h
ttp-push-ref-sta
t
u
s
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Mer
g
e
bra
n
ch 'bk/f
i
x-r
e
lative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'sd/cd-p-sho
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch
'
jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: mark
f
i
le-local functi
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ha
m
a
no
Sy
n
c with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h
'bg/maint-r
e
mote-u
p
date-def
a
ult' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
M
erge branch 'sb/maint-octo
p
us'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
amano
Merge
b
ranch 'bg/ma
i
nt-
a
dd-all-do
c
'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
M
erg
e
b
r
an
c
h 'm
a
int-1
.
6
.
5' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hama
n
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge b
r
a
nch
'
j
k
/maint-1
.
6
.
5-rese
t
-
hard' into
m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
amano
Merge branch 'tr
/
m
a
i
n
t-
1
.
6
.
5-bash-prompt-show-submod
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
Haman
o
M
e
rge bran
c
h
'
dp/
m
aint-1
.
6
.
5-fast-impo
r
t
-non
-
com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
b
ranc
h
'jm
/
ma
i
nt
-
1
.
6
.
5-gr
e
p-
N
U
L-ter
m
inat
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "chec
k
out A
.
.
.
" s
y
nonym for "c
h
eckout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
status: don't requir
e
the repository to be
w
rita
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
Haman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: honor NO_C
U
RL when
sett
i
ng
REMO
T
E_
C
URL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tar
m
ig
a
n Casebolt
ide
n
t
.
c
:
r
e
p
lace fprintf wi
t
h fputs to suppress compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
N
guyễn Thái
Ngọ
c
Duy
rm:
o
nly refres
h
entrie
s
that we
may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Da
v
id Ript
o
n
bis
e
c
t: fix singular/plur
a
l grammar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
c
v
simport: standarize sy
s
t
em() c
a
l
ls to external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
alton
cvsimport: standarize op
e
n
(
)
c
alls to exte
r
nal
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
en Walton
cvsimport: moderniz
e
callouts to git subcomman
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch 'maint-1
.
6
.
4' into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge branch 'maint-1
.
6
.
3' in
t
o ma
i
nt-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
ge branch
'maint-1
.
6
.
2
'
i
nto maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
co
m
mit 'v1
.
6
.
4
.
4-8-
g
8de6518' into m
a
int-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Hamano
Fix mis-ba
c
kport
o
f
t70
0
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update dr
a
ft rel
e
as
e
n
ot
e
s
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
Me
r
g
e
branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
U
pdate draft release not
e
s 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
Merge branch
'
dp/
m
a
i
n
t-1
.
6
.
5-
f
ast-import-non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
jc
/
rer
e
re'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge
b
ranch 'pc/unin
t
eresti
n
g-submodule-dis
a
ppear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'nd/incl
u
de-termios-fo
r
-osol
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge bran
c
h
'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
A
nd
r
e
a
s Grue
n
b
a
cher
built
i
n-apply
.
c
:
fix
t
he
--- and +++
header fi
l
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Dani
e
l Barka
l
ow
R
e
p
lace par
s
e
_
blob() with an explanatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Haman
o
Merge
b
ranch '
j
m
/
maint-1
.
6
.
5-grep-NUL-t
e
rminate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
Meye
r
ing
grep: NUL te
r
minate input
from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
An
d
reas Gruenbache
r
bui
l
t
i
n-
a
pply
.
c: Sk
i
p
fi
l
e
names
withou
t
e
n
ough
compo
n
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
amano
s
y
m
l
i
nks
.
c: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c
:
rem
o
ve un
u
sed fun
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that
mer
g
e strategies
c
an n
o
w take their ow
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Pennarun
Extend me
r
ge-subtree tests to t
e
st -X
s
ub
t
ree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Make "
s
ubtree" pa
r
t
more orth
o
gonal to the
rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next