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
Se
b
astian
Schuberth
Make di
f
ftool
.
prompt fall
back to mergetool
.
pro
m
pt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ramsay Jones
engine
.
p
l: Fix a re
c
ent breaka
g
e of the buildsys
t
em
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
unio C Hamano
git-mv: f
i
x moving m
o
re than
o
n
e so
u
rce to a single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Michael Haggerty
re
b
ase
-i: Enclose sed com
m
and sub
s
titution i
n
quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Michael H
a
ggerty
rebase
-
i: Avoid non-p
o
rtable "tes
t
X
-a Y"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
i
nus Torvalds
make
"
in
d
e
x-pack" a built-
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus T
o
rval
d
s
m
ake "git pac
k
-
r
ed
u
ndant
"
a
built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
inus Torvalds
make "git u
n
pack-file" a buil
t
-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
ma
k
e "mkta
g
" a
b
uilt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "merge-index
"
a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Johanne
s
Sixt
merge-tre
e
:
remove
unnecessary
c
a
l
l of
git_e
x
trac
t
_argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
inus
Torvalds
make "gi
t
patch-id"
a bu
i
l
t
-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
m
ake "git var" a bu
i
lt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Nico
l
as P
i
tre
fix git-p4 edito
r
invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
L
inus To
r
val
d
s
m
a
ke "
g
it h
a
s
h-object" a bui
l
t-i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linu
s
To
r
valds
make "git merge-tree" a
b
uilt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linu
s
To
r
valds
sl
i
m down
"
git sh
o
w-index"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
Remove
d
iff mach
i
nery de
p
enden
c
y
f
rom read-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hama
n
o
merge-recursive: do not r
e
turn NULL only to cause
s
e
gfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
H
o
rs
t
H
.
von Brand
git-r
e
base
.
t
x
t
:
Fix spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Tay Ray Chua
n
ret
r
y
r
equest without query when info/ref
s
?q
u
ery fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Si
x
t
Make 'rere
r
e forget' wo
r
k from a subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jo
h
annes Si
x
t
Ma
k
e test
case
n
umber
s
u
n
ique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Ham
a
n
o
con
f
l
ict-mar
k
er-size:
a
d
d test and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
Upda
t
e dra
f
t
rele
a
se note
s
to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge b
r
a
n
ch 'bw/cvsimp
o
rt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ham
a
no
Merge branch 'j
c
/
checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
Merge branch 'a
g
/patch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branc
h
'jc/co
n
f
l
ict
-
ma
r
k
e
r-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merg
e
bran
c
h 'ag/maint-apply-too-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C
Ha
m
ano
Merg
e
branch
'
ap/merge-backe
n
d-op
t
s'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branch 'nd/status
-
part
i
al-re
f
resh'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge re
m
o
te branch
'r
e
mo
t
es/trast
-
doc/
f
or
-
next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge branch 'jh/
n
otes' (early part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C Hama
n
o
Merge
b
ra
n
ch 'jc/maint-refresh-index-is-optional-f
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Ham
a
no
Merge
bran
c
h 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
r
g
e branch 'jc/cac
h
e-unmerge
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Mer
g
e branc
h
'js/exe
c
-
e
rror-report'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge branch
'
jc/l
s
-file
s
-ignored-
p
athspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'j
c
/grep-lookahe
a
d'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
r
ge branch 'jc/maint-strbuf-add-fix-doublin
g
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge branch 'mm/c
o
nfl
i
ct-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
no
Merge
branch 'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch
'
m
h
/rebase-f
i
xup'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge bra
n
ch 'ns/rebase-auto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
M
e
r
g
e
branch
'mh/rebase-fixup' (ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o
C Hamano
Merge
b
ranch
'il/push-s
e
t-upstr
e
a
m
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
M
e
rge
branch '
j
k/wa
r
n-author-co
m
mitter-after-co
m
mit'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
M
e
rge branch 'jc/id
e
n
t
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranc
h
'tr/http-p
u
sh-ref-stat
u
s'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o
C Hamano
Mer
g
e branch 'bk/fix
-
relativ
e
-gitdir-
f
ile
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Me
r
ge branch 'sd/cd-p-show
-
topl
e
vel'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
H
aman
o
M
e
rge branch 'jc/symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
dat
e
.
c: mark file-local function 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
Juni
o
C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
c
h
'bg
/
maint-
r
emote-update
-
de
f
ault' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge br
a
nch 'sb
/
maint-oc
t
opus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge branch 'bg/
m
a
int
-
add-all-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Mer
g
e
b
r
a
nch 'ma
i
nt-1
.
6
.
5
' int
o
main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C Hamano
Merge branch 'jk/ma
i
nt-1
.
6
.
5-
r
eset-hard'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'tr/ma
i
nt-1
.
6
.
5-bash-p
r
om
p
t-show-su
b
module
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch '
d
p/maint-1
.
6
.
5-fast-imp
o
rt-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge branch 'jm/mai
n
t-1
.
6
.
5-
g
rep-NUL-t
e
rmi
n
a
te' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
ma
n
o
Fi
x
"checkout A
.
.
.
" synony
m
for "checkout
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
s
tat
u
s
: don't require the repos
i
tory to be
writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile
:
honor N
O
_
C
U
RL
w
hen s
e
t
ting REMOT
E
_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmi
g
an Cas
e
bo
l
t
id
e
n
t
.
c: replace f
p
rintf with f
p
uts
to suppress compi
l
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguy
ễ
n
T
h
ái Ngọc Duy
rm: o
n
ly re
f
resh entries th
a
t we may touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Davi
d
Ri
p
t
o
n
bisect:
f
ix singular/plural
gra
m
mar nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walto
n
cvsimport: standar
i
ze system() call
s
t
o
external git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben W
a
lton
cvsimp
o
r
t
: standarize open(
)
c
a
lls to exte
r
n
al git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n
Walton
cvsi
m
p
o
r
t
:
m
o
dernize callouts to git su
b
commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Ham
a
no
M
erge bra
n
ch 'm
a
i
nt-1
.
6
.
4'
into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
Merge br
a
nch 'maint-1
.
6
.
3
' i
n
to ma
i
nt-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branch 'maint-
1
.
6
.
2' into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Ham
a
no
Merge co
m
mit 'v1
.
6
.
4
.
4-8-g8de65
1
8' in
t
o maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Fix mis-backport of t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Upda
t
e draft release notes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hama
n
o
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
U
pdate draft release notes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
un
i
o C
Ham
a
no
Merge branch 'dp/maint-1
.
6
.
5-fast-import-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jc/rerere
'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Merge branch 'p
c
/uni
n
teresting-submodule-disappe
a
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Hamano
M
e
r
g
e branch 'n
d
/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge bra
n
ch 'js/win
d
ow
s
'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gruenbacher
builtin-apply
.
c: fix t
h
e --- and +++ header filenam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Daniel
Bark
a
low
Repla
c
e
parse_blob() wit
h
a
n ex
p
l
a
n
atory
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Merge bran
c
h 'jm/maint
-
1
.
6
.
5-gr
e
p-NUL-ter
m
inate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim
M
eyering
gre
p
:
N
UL terminate inp
u
t
from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
An
d
r
eas Gruenbacher
b
uiltin-apply
.
c: Sk
i
p fi
l
enames
without enough components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
sy
m
links
.
c: remove
u
nused f
u
nc
t
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hamano
object
.
c: remov
e
unused fu
n
ction
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Documen
t
t
hat merge st
r
ategies
c
an now
t
a
ke their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Exte
n
d merge
-
subt
r
ee t
e
sts to test -Xsubtr
e
e=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C H
a
mano
Mak
e
"subtre
e
" part more orthogo
n
a
l to t
h
e rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next