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 'sp/maint-http-backend-die-triggers-die-recursively'
2010-04-03
J
un
i
o C Ham
a
no
Merge b
r
anch 'sp/maint-http-backend-di
e
-triggers-di
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
io
C
H
a
man
o
M
e
rge branch
'
rr/imap-send-unconfuse-from-line'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Ha
m
a
no
Merge branc
h
'mg/us
e
-
d
efault-abbre
v
-length-i
n
-r
e
v-l
i
st'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
aman
o
M
e
rge branch 'mg/maint
-
send-emai
l
-lazy
-
editor'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
amano
M
e
rge branch 'rb/ma
i
nt-p
y
thon-path
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
a
mano
Merge branch
'
j
n
/
m
e
r
ge-diff3-label
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C
Haman
o
Mer
g
e
branch
'ef
/
c
h
e
rry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio
C
Haman
o
M
e
rg
e
branch
'
b
w/template-tool-buildconfi
g
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C
H
amano
Merge
b
r
anch 'mg/mailmap-update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
b
ranch 'bc/t5505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch
'gh/maint-stash-show-error-message'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Ham
a
no
Merge branch 'rs/
t
hreaded-g
r
e
p-con
t
ext'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Mer
g
e b
r
a
nch
'bc/mai
n
t-daemon-sans-ss-
f
amily'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Ha
m
a
n
o
Merge bran
c
h
'
bc/
a
c
l-test'
commit
|
commitdiff
|
tree
2010-04-03
J
un
i
o
C
H
a
mano
M
e
rge branch 'j
a
/
s
en
d
-email-
e
hlo'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch
'do/r
e
base-i-a
r
bitr
a
ry'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Ham
a
no
Merge bra
n
ch
'
ak/eve
r
y
day-git
'
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefile: fu
t
ure-
p
roof Cygwin ver
s
ion check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YON
E
TANI Tomokaz
u
Fix _XOPEN_SOURCE problem on
Dragon
F
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
M
ar
k
us Heidelbe
r
g
buil
t
in/commit: remove unnec
e
ssary v
a
ria
b
le defi
n
ition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus Hei
d
elbe
r
g
builtin/commit:
f
i
x dupl
i
cated sentence in
a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric R
a
ym
o
nd
Integrat
e
vers
i
on 3 ciabot
s
cripts into contrib/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric Blake
Ma
k
ef
i
le: update defaults for modern Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Hamano
Sync with
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C Ha
m
an
o
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jun
i
o
C
H
a
m
ano
Me
r
g
e
branch 'jc/maint-refs-dangling' into maint
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
Documenta
t
ion
:
show-ref <pattern>
s
are op
t
ion
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Li
n
k ag
a
inst libic
o
nv o
n
IRIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Hol
g
er Weiß
Don't redefine hto
n
l and ntohl on
b
i
g-endian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Narebski
g
i
twe
b
: git_get_pro
j
ect_con
f
i
g req
u
ires only $g
i
t_dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
Upd
a
ted the
u
sage string of git r
e
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
Do
c
umentation: Clar
i
fy support for smart HTTP backend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
W
i
ndow
s
: fix utime() for r
e
a
d-on
l
y files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
di
f
f: fix textconv erro
r
zombies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Juni
o
C Ham
a
no
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin
Ba
l
lard
for
m
at-pat
c
h: Squelch 'fa
t
al: Not a r
a
n
g
e
.
"
e
rror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Hamano
Update
d
raft relea
s
e
n
otes
to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io C Hamano
Merge
branc
h
'c
c
/cherry-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ha
m
ano
Me
r
g
e branch 'sb/note
s
-parse-opt'
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
i
o
C
Hama
n
o
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Th
o
mas R
a
st
r
e
base -i: make post-rewrite work f
o
r
'
ed
i
t'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C
Hamano
Pr
e
p
a
re for
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
i
o C H
a
mano
M
e
r
ge bran
c
h
'cp/add-u-paths
p
e
c
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
ma
n
o
t9350: fix c
a
r
eless use of "c
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Davi
d
A
g
uilar
difftool:
Fix '--gui'
w
hen
di
f
f
.
g
u
itool
i
s
u
ncon
f
igur
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sver
r
e Rabbelier
fast-export: don't s
e
gfau
l
t
when marks
f
ile can
n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chri
s
Webb
imap-send: suppress
warning about cleartext p
a
ss
w
ord
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Gru
b
er
send-email: la
z
ily ass
i
gn
e
d
itor variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
Merge branch 'jh
/
maint
-
submodule-s
t
atu
s
-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o
C Hamano
Me
r
ge branch 'tr/notes-display'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Mer
g
e br
a
n
ch 'jl
/
sub
m
odule-d
i
ff-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio
C
Hamano
M
erge bran
c
h 'pb/lo
g
-first-
p
arent
-
p-m
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
ama
n
o
Merge br
a
nch 'jc/m
a
int-refs-
d
angling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
erg
e
branch 'jc/c
o
lor
-
attrs' into
maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge b
r
a
nc
h
'j
k
/maint-add-ignored-di
r
'
into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'bg/app
l
y-fix-blank-at-eof' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-24
S
h
awn O
.
P
earce
h
ttp-bac
k
end: D
o
n't
infinite loop
durin
g
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
.
Tyler Bal
l
anc
e
Correct references
to
/
u
sr/bin/python which does n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus
Heidelberg
D
o
cumentation
:
exp
l
ain the mea
n
ing o
f
"-g" in g
i
t-descr
i
b
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
M
i
chael J Gruber
rev
-
list:
use default abbrev leng
t
h when abbr
e
v
-commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar
R
amachandra
imap-send: Remove limi
t
a
t
ion on message body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
J
u
n
i
o C
H
ama
n
o
Sync with 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
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
6
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-21
Mich
a
el J Gruber
.
mai
l
map
:
Map th
e
the f
i
rst submis
s
ions of M
J
G
by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
l
s: re
m
ove redund
a
nt logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Fa
y
e
-
Lund
cherry: support
--a
b
brev opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gru
b
er
Documentation/gi
t
-clone: Transform
descri
p
t
ion list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gru
b
er
Document
a
tion/urls: Remove
s
p
urio
u
s e
x
a
m
ple markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
Gruber
Documentati
o
n/gitdif
f
core: Remove mislea
d
i
n
g date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/gi
t
-reflog: Fix formatti
n
g
o
f command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merge-rec
u
rsi
v
e
: add a
lab
e
l f
o
r
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Ni
e
der
cherry-pick,
r
evert: add a lab
e
l for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
reve
r
t
:
clarify lab
e
l on conflict hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
compat: add m
e
mpcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
che
c
kout
-
m --co
n
fl
i
c
t
=diff3: add a label
for
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Niede
r
mer
g
e_trees(): add
ancestor label
p
aramet
e
r for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_f
i
le():
add
comm
e
nt explaini
n
g
b
ehavior wrt co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
ath
a
n Nieder
c
h
eckou
t
--confli
c
t=di
f
f3: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merg
e
(): add
ance
s
to
r
labe
l
param
e
ter
for diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
merge-file -
-
diff3: a
d
d
a
label
f
o
r
anc
e
st
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
Nieder
xd
l
_merge(): mov
e
f
ile1 and
f
ile2 labe
l
s to xm
p
a
r
am
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xd
l
_m
e
rge
(
): add option
a
l a
n
cestor labe
l
to diff3-
s
tyle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
e
r
tests:
do
c
um
e
nt cherry-pic
k
behavior in
f
a
ce
o
f con
f
l
ict
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Niede
r
t
e
sts: docu
m
ent format of
conflic
t
s fr
o
m ch
e
cko
u
t
-
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gruber
.
mail
m
ap: Entries f
o
r
A
le
x
B
en
n
ée, Des
k
in Miller
,
Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nied
e
r
r
e
ver
t
: fi
x
tiny memory
le
a
k in cherry-pi
c
k --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Update draft
r
el
e
ase
notes
to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C
H
a
man
o
Merge branch 'jk/maint-add-
i
g
n
ored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
H
amano
M
erge bra
n
c
h
'
ml
/
color-gre
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Merge b
r
anch 'jc
/
color-a
t
t
r
s'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
M
e
rge branch '
c
c/reset-kee
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merg
e
branch 'f
l
/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Mer
g
e
b
r
anch 'bg/a
p
ply-fix-blank-at-
e
of'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Hamano
Merge branch
'bw/union-merge
-
refact
o
r'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft rel
e
ase
n
otes to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Christia
n
C
ouder
rebase
-
i
:
u
s
e
new --ff ch
e
rry-p
i
ck option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next