repo.or.cz
/
git
/
gitweb.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 Hamano
Mer
g
e branc
h
'jc/c
o
nflict-marker-size'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge b
r
an
c
h
'ef/maint-em
p
t
y-
c
ommit-log'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
Ham
a
no
Merge branch 'sg/bash-co
m
ple
t
ion'
commit
|
commitdiff
|
tree
2010-04-05
Junio C Hamano
Revert "Link
a
gainst libiconv
o
n IR
I
X"
commit
|
commitdiff
|
tree
2010-04-04
J
unio C Hamano
Mer
g
e
b
ranch
'm
a
int'
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
pack-protocol
.
tx
t
:
fix pkt-line lengths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay
Ray Chu
a
n
pack-p
r
o
t
o
col
.
t
xt: fix spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Merge branch '
m
b/re
b
a
se-i-no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Ha
m
ano
Merge bran
c
h 'sp/maint
-
http-backend-die-triggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C Haman
o
Merge branch 'rr/ima
p
-s
e
nd
-
unconfuse-from
-
lin
e
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge bran
c
h 'mg/use-default-abbrev-length-
i
n-rev-
l
is
t
'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Ha
m
a
no
Merge branch 'mg/maint-send-
e
m
ail-l
a
zy-edit
o
r'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
ge branch 'rb/maint-pytho
n
-path'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Hamano
Merge branch 'jn/me
r
ge-di
f
f3-label'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Ha
m
ano
Merge
b
ra
n
ch
'ef/cherry-abbrev
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
M
erge branch 'bw/
t
emplat
e
-
t
ool-buildconfig'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
M
erge br
a
nch
'
mg/mailmap-up
d
ate
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Ha
m
ano
M
e
rge branch 'b
c
/
t5505-f
i
x'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
b
ranch 'gh/ma
i
nt
-
sta
s
h-s
h
ow-
e
rro
r
-message'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
erge
branch 'rs/threaded-
g
rep-con
t
ext'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge branc
h
'bc/m
a
i
nt-d
a
emon-sans-ss-family'
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
io C
Hamano
Merge bra
n
ch
'
bc/acl-tes
t
'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Ham
a
no
Merge bra
n
ch
'
ja/send-email-ehlo'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C
Hamano
Merge branch 'do/rebase-
i
-ar
b
itrary'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C
H
a
m
ano
Merge branch 'ak/everyday-g
i
t'
commit
|
commitdiff
|
tree
2010-04-03
J
o
nat
h
an Nieder
Mak
e
file: future-proof C
y
gwin versio
n
check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YO
N
ETAN
I
T
o
mok
a
z
u
Fix _XOPEN_SOURCE prob
l
em o
n
Dr
a
gonFly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heidelberg
builtin/commit: remov
e
unnecess
a
r
y
variable definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus
H
e
i
delber
g
built
i
n/commit: fix
du
p
lica
t
ed sentence in a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric Raymond
Int
e
grate v
e
r
s
ion
3
ciabot scripts int
o
c
o
ntrib
/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
E
r
ic Blake
M
akefile: up
d
ate defaults for
m
odern Cyg
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Ju
n
io C Hamano
S
y
nc
w
ith 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ha
m
ano
Git
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ham
a
n
o
Merge branch
'
jc
/
maint-refs-
d
angling' into maint
commit
|
commitdiff
|
tree
2010-03-31
Holg
e
r
Weiß
Documentation:
sh
o
w-
r
ef <
p
att
e
rn>s a
r
e
opti
o
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Wei
ß
Link agai
n
st
libi
c
onv on IRI
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holge
r
Weiß
Don't red
e
fine htonl
and ntohl
on bi
g
-end
i
an
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jakub N
a
r
ebski
gitw
e
b: git_get_project_co
n
f
ig r
e
q
uires
o
nly $gi
t
_di
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
Up
d
ated the usage string of
git reset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
Docume
n
t
a
t
ion: C
l
arify s
u
p
port for
s
mart HTTP bac
k
end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
J
o
hannes
S
ix
t
Windows: fix utime()
f
o
r read-o
n
ly
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes
Sixt
diff: fix textconv e
r
ror zomb
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Junio C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ba
l
lard
format-patch: Squelch 'fatal
:
N
ot a ran
g
e
.
"
e
rror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Update draft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Me
r
ge bra
n
ch 'cc/cherry-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C Hamano
M
e
rge branch 'sb/
n
ot
e
s-
p
arse
-
opt'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-29
Thom
a
s Rast
rebase -i: make post-re
w
r
ite w
o
rk for 'e
d
i
t
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
Prepare for 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
Hamano
Merge bra
n
ch 'cp/add-u-
p
athspec' into maint
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
H
ama
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
no
t935
0
:
fix careless use of
"
c
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
difftoo
l
: Fix
'
--gui' whe
n
diff
.
guitool is uncon
f
igured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sverre Rabbe
l
ier
f
as
t
-export: don'
t
s
e
g
f
ault whe
n
marks file cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
imap-send:
s
uppress
warn
i
n
g about cle
a
rtext password
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
M
i
c
hael J Gr
u
ber
send-email:
l
a
zi
l
y
assign
e
ditor v
a
r
i
a
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Junio C Hamano
di
f
f --chec
k
: honor co
n
fli
c
t-
m
ark
e
r
-
s
i
ze
attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o C
H
a
m
a
no
M
erge bran
c
h 'j
h
/ma
i
n
t-sub
m
odule-status-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merg
e
branch 'tr/no
t
e
s
-d
i
sp
l
ay'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merge branc
h
'jl
/
submodule-dif
f
-dirtine
s
s'
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
m
a
n
o
Merge bran
c
h 'pb/log-
f
irst-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C H
a
man
o
Merge branc
h
'jc/maint-refs-dangling
'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C Haman
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'jc/color-att
r
s' into m
a
int
commit
|
commitdiff
|
tree
2010-03-24
J
unio C
H
a
mano
Merge branch 'jk/maint-add-ignored-dir' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
Merge br
a
n
ch 'bg/apply
-
fix-blank-
a
t-eof' into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-03-24
Marc Bra
n
chaud
Teach rebas
e
t
h
e --no-ff
o
ptio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Shawn
O
.
Pearce
h
t
tp-ba
c
kend: Don't infinite
l
oop during 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
.
Tyl
e
r Ballance
C
orrect refe
r
ences to /usr/bin/python which doe
s
not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus Heid
e
lberg
D
ocumenta
t
io
n
: explain the meaning of "-g" in git-d
e
s
c
ribe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
M
i
chael J
Gr
u
b
er
rev-list:
use
default abbrev length
when abbrev-commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar Rama
c
h
a
ndr
a
ima
p
-se
n
d: R
e
move limitation on
me
s
s
age b
o
dy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Juni
o
C Hamano
Sync w
i
t
h
Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Juni
o
C Hamano
Git
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Ju
n
io C Hamano
Merge bra
n
c
h
'mai
n
t-1
.
6
.
6' int
o
maint
commit
|
commitdiff
|
tree
2010-03-21
Michae
l
J
G
ruber
.
m
a
ilmap: Map the the
f
irst submissions of
M
J
G by
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lun
d
ls: remove r
e
dundant logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik
F
aye-Lun
d
cherry
:
su
p
port --abbre
v
o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentati
o
n/git-clone
:
Tran
s
form description
l
ist
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grub
e
r
Documentati
o
n
/
urls:
Re
m
ove sp
u
ri
o
u
s
e
x
ample
m
a
r
k
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documenta
t
ion
/
g
i
tdif
f
c
ore: Remove m
i
sleading
d
ate in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/git-reflog:
Fix for
m
attin
g
of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Fa
y
e-Lund
rev-list:
fix
-
-pretty
=
onel
i
ne w
i
th empty message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an N
i
eder
merge-recurs
i
ve: add a label for a
n
ce
s
tor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
ch
e
rry-pic
k
, rev
e
rt: ad
d
a
l
a
bel for
a
nce
s
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: cl
a
r
ify label on conf
l
ict hunk
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Niede
r
com
p
at:
a
dd m
e
mpcp
y
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout
-
m --conflict=diff3: add a
l
abel f
o
r
a
ncestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
merge_trees():
add
ancestor label parameter fo
r
di
f
f3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
merge
_
file(): add
c
omment expla
i
ning be
h
avior wrt conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
than Ni
e
der
c
hec
k
out --con
f
l
i
ct=dif
f
3: add
a
l
abel for
a
ncestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
ll_merge()
:
add ancest
o
r
label
parameter f
o
r diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
merg
e
-file
--diff3: add a label for an
c
estor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
xdl_merg
e
()
:
move f
i
le1 and
fil
e
2 labels to
x
mpar
a
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
xd
l
_merge(
)
: add option
a
l ancestor label to di
f
f3-styl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
t
ests: document che
r
r
y
-pi
c
k
behavior
i
n face of co
n
flicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: d
o
cument form
a
t of conflicts
from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
.
m
ailmap: Entr
i
es for Ale
x
Bennée, Deskin Mille
r
,
Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
revert
:
fix tin
y
m
emory leak in cherry-pic
k
-
-
ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next