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
fast-import: Improve robustness when D->F changes provided in wrong order
2010-07-09
Elijah Newren
fast-i
m
port: Im
p
rove robustne
s
s
w
h
en D-
>
F changes provid
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast
-
export:
Fix output order of D/F
c
h
a
nges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h Newren
merge_rec
u
rsive:
Fix renames acr
o
s
s
pat
h
s
b
e
l
o
w
D/F
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
El
i
j
ah
Newren
merge-recursive: Fix D/F conflic
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
A
l
exander Gladysh
A
dd a r
e
name + D/
F
conf
l
ict test
c
as
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
Ad
d
add
i
tional
t
estc
a
ses for D/F conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Junio
C Hamano
Git 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hamano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-04-23
Eric Raymond
Docu
m
ent
a
tion impr
o
vements
for the descr
i
ption
o
f sh
o
r
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
J
unio C Haman
o
Sync
with 1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
J
u
n
i
o C H
a
man
o
Git 1
.
7
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Ham
a
n
o
Merge b
r
a
nch 'mg/use-default-abbrev-length-in-rev-lis
t
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Junio C H
a
mano
Me
r
ge
b
ranch 'wp/doc-filt
e
r-
d
irection' int
o
maint
commit
|
commitdiff
|
tree
2010-04-23
J
unio C
Ham
a
n
o
M
erge branch 'jk
/
maint-diffstat-overflow' in
t
o main
t
commit
|
commitdiff
|
tree
2010-04-23
Junio
C
Ham
a
no
Merge br
a
nc
h
'da
/
maint-python-st
a
rtup' into maint
commit
|
commitdiff
|
tree
2010-04-22
Junio C H
a
mano
Merg
e
branch
'
maint
'
commit
|
commitdiff
|
tree
2010-04-22
Jonat
h
an Niede
r
D
ocumentation/Makefile: fix interrupted builds of user
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
Junio C Hama
n
o
Mer
g
e b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2010-04-20
M
i
chael J Gru
b
e
r
t
7
0
12: Ma
r
k
missing tests as
T
OD
O
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-20
SZEDE
R
Gáb
o
r
ref
l
og: remove 's
h
ow' fro
m
'e
x
pire's usage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Mer
g
e
branch 'maint-1
.
6
.
6'
i
n
to maint
commit
|
commitdiff
|
tree
2010-04-19
Jo
h
annes
S
i
xt
MSVC: F
i
x buil
d
by addin
g
miss
i
ng
ter
m
ios
.
h dummy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
J
u
nio C Hamano
G
i
t
1
.
7
.
1-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o
C
Hamano
Merge branch 'rr/remote-helper-d
o
c'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Haman
o
Merge branc
h
'wp
/
doc-
f
ilter-
d
irection'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Ha
m
ano
Merge b
r
an
c
h 'jk/maint-diffstat-ov
e
r
f
lo
w
'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
M
e
r
g
e branc
h
'jg/auto
-
in
i
t
i
a
lize-note
s
-wit
h
-
p
ercent
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-04-19
Ju
n
io C Ham
a
no
Me
r
ge git:/
/
git
.
kernel
.
o
r
g/
p
ub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2010-04-18
Ramk
u
mar Ramachandra
Do
c
u
mentation/remote-helpers
:
Fix typ
o
s
and improve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramk
u
mar Ramachand
r
a
Fixup: Seco
n
d
a
r
gument
m
ay be any arbitra
r
y string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ram
k
umar Ramachandra
Docum
e
n
tation/re
m
ote-helpe
r
s: A
d
d in
v
oc
a
tion section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ramku
m
ar
R
amachand
r
a
Docu
m
entation/urls: Rewrite to ac
c
om
o
date
<
t
ransport
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
R
a
mk
u
mar Ramachandra
Documen
t
ation/remo
t
e-helpers: Rew
r
ite de
s
cription
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
Ba
i
ley
Docume
n
tation: Descri
b
e other situa
t
ions whe
r
e -z af
f
e
cts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Jeff
King
rebase-in
t
eractiv
e
: silence wa
r
ning wh
e
n no c
o
mmits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-18
Junio C Hama
n
o
t330
1
: a
d
d tests
t
o
u
se --format="%N
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-04-17
Matthew O
g
i
l
vie
t6006: do
n
ot write to /tmp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Chris Webb
g
it-instaweb: pas
s
throu
g
h i
n
voking user'
s
path t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Ju
n
io C Ha
m
ano
g
itweb: s
i
mplify gitweb
.
min
.
*
generation and clean
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonat
h
an Nieder
tag -v:
u
se
R
UN
_
GIT_CMD to run verify-tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Wi
l
l Palmer
do
c
umentatio
n
: clarify directi
o
n of core
.
a
u
t
ocrlf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Je
f
f
King
diff: use large integers fo
r
diffstat c
a
lcula
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Michael
J
Gruber
t1010-mk
t
ree:
A
djust expe
c
ted result to code and
d
o
cumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-17
Thomas Rast
c
o
mbined diff:
c
or
r
ectly
h
an
d
le
t
runcated fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
Docu
m
ent new "already-me
r
g
ed" rule for branch -d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an Nieder
Add
.
depend directori
e
s to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-14
Junio
C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-04-14
Johannes Gi
l
g
er
pretty:
I
ni
t
ialize n
o
tes
i
f %N i
s
used
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-13
J
a
y
S
offian
Documentation/conf
i
g
.
txt: default gc
.
a
gg
r
e
ssiveWindow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-12
Mar
c
Branchaud
Docs: A
d
d -X opt
i
on to git-merge's
synopsis
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Juni
o
C H
a
man
o
Merge branch '
j
l/ma
i
nt-submodule-gitfil
e
-
awareness'
commit
|
commitdiff
|
tree
2010-04-11
Johann
e
s
S
i
xt
Wi
n
d
ow
s
: s
t
art_co
m
mand: Suppor
t
non-NULL dir in
s
truct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Sy
n
c
w
i
th 1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Junio C
Hamano
Merge branch 'jc/doc-submit-gmail'
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Git 1
.
7
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C Hamano
Merg
e
branch 'rc/maint-reflog-msg-for-forced-branch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
J
unio C H
a
mano
blame documenta
t
ion: -M/-C notice c
o
p
ied lines as well
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-11
Stephen Boyd
t
3507: Make
tes
t
executable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio
C
H
amano
Git
1
.
7
.
1-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Ha
m
ano
Merge branch
'mr
/
gitweb-jsmin'
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C Ha
m
a
n
o
Merge b
r
anch '
j
l/ma
i
nt-submodu
l
e-gitfile-aw
a
re
n
ess'
commit
|
commitdiff
|
tree
2010-04-10
J
e
ns
L
eh
m
ann
Teach
d
iff
--submodule and status to ha
n
d
l
e
.
git files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hama
n
o
M
e
r
g
e branch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-04-10
J
ens Lehmann
Let check_
p
reimage() use
m
emset() to initialize "struct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
i
o
C Ha
m
ano
Merge br
a
n
c
h
'
e
f
/maint-empty-com
m
it-log'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
M
erge branc
h
'
jc/conflict-marker
-
size
'
into
maint
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o
C
Hamano
M
erge branch
'
s
p/main
t
-http-backend-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Juni
o
C Hama
n
o
Merge bra
n
ch 'mg/maint-se
n
d-email-laz
y
-editor' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
J
u
ni
o
C Hama
n
o
Merge branch 'r
r
/imap-s
e
nd
-
unconfus
e
-from-line'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merg
e
br
a
nch 'rb/
m
a
i
nt-pytho
n
-pat
h
'
into maint
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branch 'gh/ma
i
nt-stas
h
-sho
w
-er
r
or-mes
s
age
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge
branch '
m
g/mailm
a
p-u
p
date' in
t
o main
t
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Hamano
Merge br
a
nch 'bc/m
a
int-
d
aemon
-
s
ans-ss-family' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
T
ay
Ra
y
Chuan
fetch/
p
ush: fix usage s
t
r
i
ngs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-10
J
unio C Hamano
Merge
branch 'rc/ma
i
nt-reflog-msg-for-f
o
r
ced-branch'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ray Chuan
b
ranch: say "R
e
set to
"
i
n reflog entries for 'git bran
c
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
Merge earl
y
parts of jk/cached-textconv
commit
|
commitdiff
|
tree
2010-04-09
Juni
o
C Hamano
diff
.
c
:
work around
p
o
i
n
ter cons
t
ness
war
n
ing
s
commit
|
commitdiff
|
tree
2010-04-09
Junio C Ham
a
no
Merge
b
r
an
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-04-08
Jeff Kin
g
d
oc
s
: clarify "b
r
anch
-
l
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Ju
n
io
C
Ham
a
no
Sub
m
ittingPatches: upd
a
te GMail section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Jun
i
o
C H
a
mano
Merge bran
c
h
'mg
/
notes-reflog'
commit
|
commitdiff
|
tree
2010-04-07
Ju
n
io C
H
a
mano
Merge branch 'jn/maili
n
fo-s
c
isso
r
s'
commit
|
commitdiff
|
tree
2010-04-07
Jeff King
fix
typos and gra
m
mar in 1
.
7
.
1 d
r
aft release no
t
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-07
Brand
o
n
C
as
e
y
notes
.
h: declare bi
t
field as unsign
e
d
t
o silence compi
l
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Ju
n
io
C Hamano
Git
1
.
7
.
1-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge branch 'da/
m
a
i
nt-python-start
u
p
'
commit
|
commitdiff
|
tree
2010-04-06
Jun
i
o C Hamano
M
er
g
e br
a
nc
h
'
i
c/bash-completion-rp
m
'
commit
|
commitdiff
|
tree
2010-04-06
Ju
n
io C Hamano
Merg
e
branch 'sb/fmt-merge-msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Haman
o
Me
r
ge bran
c
h 'jc/confl
i
ct
-
mark
e
r-si
z
e'
commit
|
commitdiff
|
tree
2010-04-06
J
unio C Hamano
Merge branch 'ef/maint
-
empty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge branch 'sg/bash-
c
omplet
i
o
n'
commit
|
commitdiff
|
tree
2010-04-05
Junio C Ha
m
ano
Revert "Lin
k
again
s
t libi
c
onv
on IRIX"
commit
|
commitdiff
|
tree
2010-04-04
Junio C Ham
a
no
M
erge branch '
m
aint
'
commit
|
commitdiff
|
tree
2010-04-04
T
ay
R
ay
C
huan
pack-pr
o
toc
o
l
.
txt: f
i
x pkt-li
n
e lengths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
p
a
ck-prot
o
col
.
txt: fix spelling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan
Nieder
Teach mailinfo %< as an
alternative scis
s
ors ma
r
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge b
r
anch 'mb/r
e
bas
e
-i-
n
o-ff
'
commit
|
commitdiff
|
tree
next