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 "git merge-tree" a built-in
2010-01-22
Linus Torvalds
make "
g
it
m
e
r
g
e
-tree
"
a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Tor
v
alds
slim down "git
s
how-ind
e
x"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linu
s
Tor
v
alds
R
emove diff ma
c
hinery
d
e
p
e
ndency fro
m
read-
c
ache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Horst H
.
vo
n
Brand
git-reb
a
se
.
txt: F
i
x spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes
S
ixt
Mak
e
'rerer
e
forget'
wo
r
k from
a
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
o
hannes Sixt
Make test case
n
umber
s
u
nique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
conflict-marker-s
i
ze: add te
s
t and do
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
n
i
o C Hamano
Update draft r
e
l
ease n
o
tes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hamano
M
erge
branch 'bw/cv
s
i
m
port
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Me
r
ge branch 'j
c
/checkout-merge-
b
ase'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merge branch
'
a
g/patch-head
e
r-veri
f
y'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge bran
c
h
'jc/conflict-ma
r
ker-si
z
e'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
g
e
b
r
anc
h
'ag
/
m
a
int-
a
ppl
y
-t
o
o-la
r
ge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Haman
o
M
e
rge branch 'ap/
m
erge-backend-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge branch 'nd
/
status-partial-re
f
re
s
h'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rg
e
remo
t
e
branch 'remotes/trast-doc/for
-
next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge
bra
n
ch 'jh/
n
o
t
es' (early part
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Haman
o
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch 'jc/main
t
-refr
e
sh-index-is-
o
ptional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bran
c
h 'rr
/
core-
t
u
to
r
ial
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
ni
o
C Ham
a
no
Merge branch 'jc/
c
ache-unmerg
e
'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Me
r
ge bra
n
ch 'j
s
/exec-e
r
ror-
r
ep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
b
ranch 'jc/
l
s-files-ignore
d
-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
Merg
e
branch 'jc/g
r
ep-
l
ook
a
hea
d
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C
Haman
o
Merg
e
br
a
nch
'
jc/maint-strbu
f
-add-fix
-
doubling'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge br
a
nch 'mm/co
n
flict-adv
i
ce
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
M
e
rge branch 'da
/
dif
f
tool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merg
e
b
r
an
c
h 'mh/
r
ebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge b
r
anch 'n
s
/
rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C H
a
mano
Merge b
r
anch
'mh/rebase-fixu
p
'
(
e
a
rl
y
p
a
rt)
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C
H
a
mano
Merge branch
'
i
l/push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hama
n
o
Merge
branch
'
jk/wa
r
n-author-co
m
mit
t
e
r
-after-
c
ommit'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge br
a
n
ch '
j
c/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge bra
n
ch 'tr/http-pus
h
-r
e
f-sta
t
u
s
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
m
ano
Merg
e
branch 'bk/fix
-
relative-gitdir
-
file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
an
o
Merge branch 'sd/cd-p-sho
w
-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C H
a
mano
Merge
branch
'
j
c
/symbol-s
t
atic'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
date
.
c: mark fi
l
e-local functio
n
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
S
y
nc wi
t
h
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Ham
a
no
M
erge bran
c
h 'bg/maint-remote-update-defa
u
lt' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge
b
r
anch 'sb/main
t
-octopus' into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
mano
Mer
g
e branch 'b
g
/maint-ad
d
-all-doc'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Mer
g
e br
a
n
ch 'ma
i
nt-1
.
6
.
5' i
n
to main
t
commit
|
commitdiff
|
tree
2010-01-20
Junio
C H
a
mano
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'jk/
m
aint-1
.
6
.
5-re
s
et-hard' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o C Hamano
M
e
r
g
e b
r
anch 'tr
/
maint-1
.
6
.
5-bash-
p
romp
t
-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C
H
a
m
ano
Me
r
ge branch '
d
p/maint-1
.
6
.
5-fast
-
i
m
port
-
non-com
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
M
e
rge branch '
j
m
/maint-1
.
6
.
5-gr
e
p
-NU
L
-ter
m
in
a
te'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Fix "check
o
u
t
A
.
.
.
"
synonym for "chec
k
out
A
.
.
.
H
E
AD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
status
:
d
on
'
t require the repository to be writab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Si
x
t
Ma
k
efile: hon
o
r NO_CURL when setting REM
O
TE
_
CURL_
*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
T
arm
i
g
a
n C
a
sebolt
ident
.
c: repl
a
c
e
f
printf with fput
s
to
s
uppress compil
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái N
g
ọc Duy
rm:
onl
y
refresh en
t
r
ies that we
m
ay
to
u
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
vi
d
Ripton
bisec
t
: f
i
x singular/plural gram
m
ar
nit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
B
en Walt
o
n
cvsim
p
ort: standarize system() calls
to ext
e
r
nal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
W
alton
c
v
simport
:
s
ta
n
d
a
rize open() calls to e
x
terna
l
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben W
a
lt
o
n
cvsimp
o
r
t: moderniz
e
c
a
l
l
outs to git subco
m
mands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Merge bra
n
c
h 'maint-1
.
6
.
3
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge bran
c
h 'm
a
int-1
.
6
.
2'
in
t
o ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
ma
n
o
M
e
rge co
m
mit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C H
a
mano
F
ix mis-
b
ackport
o
f t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Upd
a
te draft
release
notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Upd
a
te dra
f
t release
n
otes to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Haman
o
Merge branch 'dp/maint-1
.
6
.
5-fast-i
m
port-no
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
erge branch 'j
c
/re
r
er
e
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
r
anch 'pc/uninteresting-subm
o
dule
-
disa
p
p
ea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
m
a
no
Merge branc
h
'nd/include-termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
M
erge
bran
c
h 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andrea
s
G
ruenba
c
her
buil
t
in-ap
p
ly
.
c
: fi
x
the --- and +++ header filena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
aniel Barkalow
Replace parse_blob() with
a
n explanatory comme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge branch 'jm/mai
n
t-1
.
6
.
5-grep-NUL-
t
erminate
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
Meyer
i
ng
grep: NUL ter
m
i
nate input
f
rom a fi
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andrea
s
Grue
n
bacher
builtin
-
apply
.
c
:
Skip filenames without enoug
h
components
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C
H
a
mano
symlinks
.
c:
remove
u
nused func
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
o
b
ject
.
c
: r
e
move unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio
C
Ha
m
ano
Document
t
h
at m
e
r
ge strategies c
a
n no
w
take
t
heir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
v
ery Penna
r
un
Extend merge-subtree tests to test -Xsub
t
ree=d
i
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Mak
e
"subtree"
part mo
r
e ortho
g
onal
t
o
the
rest o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull: Fix pa
r
sing of -
X
<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
enn
a
r
un
Teach git
-
pull to pa
s
s -X<option>
t
o git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very P
e
n
narun
git merge -X<o
p
tion>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Update draft
r
el
e
a
s
e
n
o
t
es to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
uni
o
C Hama
n
o
Merg
e
b
ran
c
h 'tc/test-loca
t
e-http
d
'
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Merge branch 'jh/com
m
it-status'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C H
a
ma
n
o
Merge b
r
anch 'jn/makef
i
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
M
erge branch 'jc/maint-1
.
6
.
1-checkout-m
-
cus
t
om-
m
erge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merg
e
b
ranch 'tc/clone
-
v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Merge branch 'tc/smart
-
http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
M
e
rge br
a
nch
'
jk/r
u
n-command
-
use-
s
he
l
l'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Hama
n
o
M
erge branch 'sr
/
gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Update COPYING
wi
t
h
G
PL
v
2 with new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ide
n
t_sufficientl
y
_
g
iven(
)
:
refactor
the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hama
n
o
u
ser_ident_sufficiently_given(): refactor t
h
e l
o
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
rerere: honor co
n
fl
i
ct-mark
e
r-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
rerere: prepare for customizable conflict marker
l
ength
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
commit
.
c::print_sum
m
ar
y
: do not release the form
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next