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 'mg/maint-send-email-lazy-editor'
2010-04-03
Junio
C Hamano
Mer
g
e branch 'mg
/
mai
n
t
-send-email-lazy-editor'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Merge branc
h
'rb
/
maint-python
-
pa
t
h'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Haman
o
M
e
rge b
r
anch 'j
n
/
merge-diff3-label'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C H
a
man
o
M
erge branch 'ef
/
che
r
ry-abb
r
ev'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
i
o
C
Hamano
Merge branch 'bw/templ
a
te-tool-buildconfig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
erge branch
'
mg/mailmap-update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'bc/t5505-
f
i
x
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'gh/
m
a
i
n
t
-
s
tas
h
-sh
o
w-error-mess
a
ge'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branc
h
'r
s
/t
h
readed-grep-cont
e
xt'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io
C
Haman
o
Merge branch 'bc/ma
i
nt-d
a
emon-san
s
-
ss-family'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C Ha
m
an
o
Merge branch 'bc
/
acl-test'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C
H
a
mano
M
erge
b
ranch 'ja/se
n
d-email-e
h
l
o'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge
b
ra
n
ch
'do/r
e
base-i-arbitrary'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'ak/e
v
ery
d
ay-git'
commit
|
commitdiff
|
tree
2010-04-03
Jonatha
n
Nieder
Make
f
il
e
:
f
uture-proof Cygwin version ch
e
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI Tomokazu
F
i
x
_XO
P
EN_SOU
R
CE problem on DragonFly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heidelberg
b
uiltin/
c
omm
i
t: remo
v
e unn
e
cessary v
a
riable definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heidelberg
builti
n
/commit: fix dupl
i
cated senten
c
e in a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
E
ric Raymon
d
I
n
tegra
t
e version 3 c
i
abot scripts into contri
b
/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric Bla
k
e
Ma
k
e
file: upd
a
te defaults for
modern Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
Hamano
Syn
c
w
i
th
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Ham
a
n
o
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Hama
n
o
Merge bra
n
ch 'jc/mai
n
t-refs-danglin
g
' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-31
Holger Wei
ß
Document
a
tion
:
show-ref <pat
t
ern>s a
r
e opt
i
on
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Li
n
k
a
ga
i
nst l
i
bic
o
nv on IRI
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
Don't redefine htonl and ntohl on bi
g
-endi
a
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Narebski
g
i
t
we
b
: git_get_project_config
r
equires on
l
y $git_dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
Updat
e
d
the usage s
t
ring of
g
i
t
r
eset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg Baco
n
Documentation: Clarify
s
up
p
o
rt for smart HTTP backend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Windows: fix
u
time() for read-only
f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johan
n
es Sixt
di
f
f: f
i
x textconv error zombies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Ke
v
in Ballard
format-patch: Squ
e
l
c
h
'
fatal:
N
ot a
ra
n
ge
.
" error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hamano
Update
d
r
aft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Merge br
a
n
ch
'
cc/cherry-pick
-
ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
Hamano
Merge
b
ranch 'sb/n
o
tes-pa
r
se
-
opt'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
H
a
mano
M
e
r
ge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-03-29
Thomas Rast
reba
s
e
-i: make
post-re
w
rit
e
work for 'edit'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Prepa
r
e for
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Mer
g
e branch 'cp/add-u-
p
athspec' into maint
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
i
o
C Hama
n
o
Merge bran
c
h
'main
t
'
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
t
9
350: fix car
e
less use o
f
"c
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
David
A
g
uilar
difftool: Fix '--
g
ui' w
h
en diff
.
guitool is unco
n
fi
g
ured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
S
v
erre Rabbel
i
er
fast-expor
t
:
d
on't segfault wh
e
n mark
s
file cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
imap-send:
suppre
s
s warning
a
bout cl
e
artext pa
s
sword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Michael J
G
r
uber
send-email: lazily assign ed
i
tor variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o
C Hamano
Me
r
g
e
b
r
anch 'j
h
/ma
i
nt-subm
o
dule-status-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o C Hamano
Merge
b
r
anch 'tr/notes-di
s
play'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Merg
e
branch 'jl/submo
d
ule-
d
i
f
f
-
di
r
t
i
ne
s
s'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C
H
am
a
no
Merge branch 'pb/log-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
Merge bran
c
h 'j
c
/
m
a
int-refs-dangl
i
n
g
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
an
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Hamano
Merge br
a
n
c
h 'jc/color-attrs
'
into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'jk/maint-
a
dd-
i
gnored-dir' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio
C Haman
o
Merge bran
c
h 'bg/apply-fix
-
b
l
ank-
a
t-
e
of' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
R
.
T
y
ler Ballance
Correct referen
c
es
t
o /us
r
/bin/python whic
h
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Mar
k
us
H
eidelberg
Doc
u
mentation:
e
x
p
lain
t
h
e
m
ean
i
n
g
of "-g" in git-describe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Ju
n
i
o
C Ha
m
ano
Sy
n
c with Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio C
Hamano
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
Mer
g
e branch
'
maint-1
.
6
.
6
' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grub
e
r
.
mailmap: Map th
e
the first su
b
mi
s
sions of MJG
b
y e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
E
r
ik Faye-Lun
d
ls
:
re
m
ove red
u
ndant l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
ye-Lun
d
cherry: support --abbrev
o
pt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
Documentation/git-cl
o
ne: Transform desc
r
i
p
t
i
on
l
ist
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael
J
Gruber
Docu
m
entation
/
url
s
: Remo
v
e spurious example
ma
r
ker
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentatio
n
/g
i
tdif
f
core: Rem
o
ve
m
isleading
d
ate
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Docume
n
tatio
n
/
git-reflog: Fix forma
t
t
i
ng of
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
than Nieder
merge-rec
u
r
s
ive: add a la
b
el
f
or
anc
e
stor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
che
r
r
y-
p
ick, revert:
a
d
d a label
fo
r
a
ncest
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
rev
e
rt: c
l
arify labe
l
on conflict hun
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
o
mpat: add m
e
mpc
p
y()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout -m --confli
c
t
=
diff3:
a
d
d a label fo
r
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
m
er
g
e_trees(): a
d
d ances
t
or label parameter for d
i
f
f
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file():
a
dd co
m
ment e
x
pla
i
n
i
ng behavior wrt conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
heck
o
ut --c
o
nf
l
ict=diff3: ad
d
a label fo
r
ancesto
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Niede
r
ll_merge
(
): add anc
e
sto
r
label parameter for diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n
Nieder
merge-fil
e
--di
f
f3:
a
d
d a labe
l
for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
xdl_merge(): move file1
and file2 labels to xm
p
a
r
a
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
iede
r
xdl_
m
er
g
e
(
): ad
d
o
p
ti
o
nal ancestor label to diff3-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
tests: document cherry-p
i
ck behavio
r
in face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: d
o
cument format of
co
n
f
licts
f
rom checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gruber
.
mailmap: Entrie
s
for A
l
ex Bennée, Deskin Mil
l
er,
Vita
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Ni
e
der
r
e
v
er
t
: fix
t
in
y
m
emory leak in cherry-pick
-
-ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Update draft
r
elease
notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge bra
n
ch
'jk/maint-
a
dd-ignored
-
dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
Merge branch 'ml/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Ham
a
no
Merge
branch 'jc/
c
olor-att
r
s'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ha
m
ano
Merge branch 'cc/reset-k
e
ep
'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Merge bra
n
ch 'fl/askpa
s
s'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
Merge branch
'
bg/apply-fix
-
blank-at-eo
f
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Ha
m
ano
Merge branch 'bw/un
i
on-merge
-
refactor
'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
mano
Update dr
a
f
t release notes
to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Chr
i
stia
n
C
ouder
r
ebase -i: use new --ff cherry-pick
o
pti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch: Fix minor memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas Grue
n
b
ache
r
fetch: Future-proof initialization of a refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
ndrea
s
Gruenb
a
c
h
e
r
fetc
h
: Check for a "^{
}
"
suffix with suffixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benj
a
min C Meyer
Fix
a spelling mista
k
e in a git-p4 cons
o
le message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bria
n
Gernhar
d
t
Use tes
t
_e
x
pect_success for
t
est setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben Walton
Modernize git c
a
ll
i
n
g
conventions
in hook te
m
plates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next