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
Merge branch 'jc/conflict-marker-size'
2010-04-06
Junio C
H
amano
Merg
e
bran
c
h 'jc/conf
l
ic
t
-
m
ar
k
er-
s
ize
'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
M
er
g
e b
r
anch 'e
f
/maint-empt
y
-
c
om
m
it-
l
og'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Ham
a
no
M
e
rge branch
'
s
g
/
bash-
c
ompletion'
commit
|
commitdiff
|
tree
2010-04-05
J
u
ni
o
C Haman
o
Rev
e
r
t "
L
i
n
k a
g
ainst libiconv on I
R
IX
"
commit
|
commitdiff
|
tree
2010-04-04
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
p
a
c
k
-pro
t
ocol
.
txt: fix
p
kt-line
l
e
ngths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay
Ray
Chuan
p
ack-pr
o
toco
l
.
txt: fix sp
e
lling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
g
e branch '
m
b/rebase-i-no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Hamano
Merg
e
b
ranch
'sp/maint-http
-
ba
c
kend-die-triggers-di
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
branch 'rr/i
m
ap
-
send-un
c
onfus
e
-from-li
n
e'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
g
e branch '
m
g/use-default
-
abbrev
-
l
ength-in-r
e
v-list'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge
b
ranch
'mg/maint-send
-
emai
l
-laz
y
-
editor'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
amano
Merge branch 'rb
/
ma
i
nt-py
t
hon
-
pa
t
h'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge b
r
anch 'jn/
m
erge-
d
iff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge branch
'
ef/cherry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge bra
n
c
h
'bw/template
-
t
ool-buildconfig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge b
r
anch 'mg/
m
ai
l
map-updat
e
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Haman
o
Me
r
ge
b
ranch
'
b
c
/
t
5505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
b
ranc
h
'
g
h/maint-stash-
s
how-error-message'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ham
a
no
M
erge b
r
an
c
h
'
rs/t
h
rea
d
ed-
g
rep-context'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
H
a
mano
Merge branch '
b
c
/maint-
d
aemon-
s
a
n
s-s
s
-
f
a
mily
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hama
n
o
M
erge b
r
a
n
ch 'bc/a
c
l-test
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Hamano
Merge branch '
j
a/send-e
m
ai
l
-ehlo'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'do/rebase
-
i-arbitra
r
y'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge bra
n
ch 'ak/everyday-git
'
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
athan N
i
e
d
er
Mak
e
file: future-proof Cygwin v
e
rsion ch
e
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
YONE
T
A
NI Tomokazu
Fix _X
O
PEN
_
SOURCE problem on DragonF
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
M
a
rkus Heidelb
e
r
g
b
u
iltin/
c
ommit: r
e
m
o
ve unn
e
cessary variable de
f
inition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Mar
k
us Hei
d
elberg
bui
l
ti
n
/commit: fix duplicated sen
t
e
n
ce in a comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
E
r
ic Ray
m
ond
Integrate version 3 ci
a
bot scr
i
p
t
s into co
n
t
rib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric Blake
Makefile:
u
p
date
d
e
faults
f
or mod
e
rn Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ha
m
ano
Sync wit
h
1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Hamano
Git 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
unio C Hamano
Merge
branch 'jc/
m
aint-refs-dangli
n
g' into maint
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
Document
a
tio
n
: show
-
ref
<
patter
n
>s are optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Link against libi
c
onv on
IRIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Ho
l
ger Weiß
Don't redef
i
n
e
htonl
a
nd
n
tohl on big-endian
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Narebski
gitweb
:
g
it_get_
p
r
o
ject_config requi
r
es only $git_
d
ir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
a
n Stępień
Updat
e
d the
usa
g
e strin
g
of git reset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Gre
g
Baco
n
D
o
c
ume
n
t
a
tion: C
l
a
r
ify
su
p
p
ort for smart HTTP
b
ackend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Six
t
Windows: fix
u
tim
e
() for re
a
d-
o
n
l
y f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
o
hannes Si
x
t
diff: fix
t
extconv error
z
o
m
bies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
u
nio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Balla
r
d
format
-
patch
:
S
q
u
elch 'fatal
:
Not a
range
.
" error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
U
p
date d
r
aft release not
e
s to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Jun
i
o C Hama
n
o
Merge bra
n
ch 'cc/cherry-p
i
ck-f
f
'
commit
|
commitdiff
|
tree
2010-03-29
J
unio
C
H
a
mano
Merge branc
h
'sb/note
s
-pa
r
se
-
opt'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-03-29
Thomas Rast
rebase -i: make p
o
st-
r
ewr
i
te wo
r
k
for 'edi
t
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Prepare for 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Merge branch 'cp/add-u-pat
h
spec
'
into
maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
t9350: fix c
a
reless use of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguilar
d
i
fftool: F
i
x '--gui' when diff
.
guitool is
u
n
config
u
red
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Sverre Rabbelier
fast-exp
o
rt: don't
s
e
gfaul
t
w
hen marks file cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
C
hris
W
ebb
imap-send: suppress war
n
ing abou
t
c
leartext passw
o
r
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J
G
ruber
send-emai
l
: laz
i
ly assign
e
ditor variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
J
unio C H
a
mano
diff --check:
h
o
nor conflic
t
-ma
r
ker-
s
ize attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
amano
M
e
r
g
e
branch '
j
h
/
main
t
-
s
ubmodule-st
a
tus-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Me
r
ge
branch '
t
r/notes-di
s
play'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge bra
n
ch '
j
l/submodule
-
diff-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
Me
r
ge branch 'pb/log
-
first
-
par
e
nt
-
p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
ge bran
c
h
'jc
/
m
a
i
n
t
-refs-danglin
g
'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Merge
b
ranch 'jc/
c
olor-attrs'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merge branch 'jk/maint-add-igno
r
ed-dir' into maint
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
M
erge branch 'bg/apply-fix-bla
n
k
-
a
t-eof' into maint
commit
|
commitdiff
|
tree
2010-03-24
Marc B
r
ancha
u
d
Teach rebase
t
he --no-ff option
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
S
hawn O
.
Pear
c
e
http
-
backend: Don't infinite loop d
u
ring die
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
R
.
T
y
l
e
r Ballanc
e
Correct
r
eferences to /usr/bin/python
which does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Markus Heidel
b
erg
Doc
u
menta
t
ion: expl
a
in the m
e
aning of "-
g
"
in git-describe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mi
c
hael J Gruber
rev-list
:
use default
a
bbre
v
lengt
h
when abbr
e
v
-
commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar Ramachandra
imap-sen
d
:
R
emove limitation on message body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
H
amano
Sync with Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio C Ha
m
ano
G
i
t 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Me
r
ge branc
h
'main
t
-1
.
6
.
6
'
into maint
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
h
a
e
l
J Gruber
.
mailmap: Map the the first submissions of MJG b
y
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-L
u
n
d
ls: remove
redundant lo
g
ic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
cherry
:
suppor
t
-
-abbrev op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mich
a
el J
G
rub
e
r
Documen
t
atio
n
/g
i
t
-cl
o
ne: Transform description
l
i
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael J Gruber
Documentation/
u
rls:
Re
m
ove spurio
u
s
e
xample
mark
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J Gruber
Document
a
t
i
on/gitdiffcore: Remove misleading date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael J Gruber
Documentation/
g
it
-
reflog: Fix formatting of c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
rik Faye-
L
u
nd
rev-list: fix
--pret
t
y=oneline
with e
m
p
ty message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recurs
i
ve: add
a label for ance
s
t
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, revert: add a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
r
eve
r
t: clarif
y
label on conflict hunk
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat
:
add mempcpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
t
h
an Nieder
checkou
t
-m --conflict=diff
3
: ad
d
a label for a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nieder
merge_trees(
)
: add ancestor label parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
e
rge_file(): add
comment explaining behavior
w
r
t co
n
flict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan N
i
eder
checkout --c
o
n
f
lict=d
i
ff3: add
a
label for ancesto
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
ieder
ll_mer
g
e(): add ancestor label paramet
e
r for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
mer
g
e-file --diff3: a
d
d a la
b
el
f
or
a
nce
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
xdl_merge(
)
:
move file1 and f
i
l
e2 l
a
bels to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
d
l_merge(
)
:
add
o
ptional anc
e
stor label
to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Ni
e
de
r
tests: document che
r
ry-pick
beha
v
ior in fa
c
e of
confl
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Niede
r
tests
:
doc
u
ment fo
r
m
a
t
of conflicts fr
o
m checkout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
mailm
a
p:
Entries f
o
r
A
le
x
Bennée, De
s
kin Miller, Vita
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
revert
:
fi
x
t
iny m
e
mory leak in
cherry-pic
k
--ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next