repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mb/rebase-i-no-ff'
2010-04-03
Ju
n
io C Hamano
Merge branc
h
'mb
/
reb
a
se-i-
n
o-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
r
g
e
b
r
anc
h
'
s
p
/maint-http-
b
ackend-die-tr
i
ggers-d
i
e
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C Haman
o
Merge branch 'rr/imap-send-unconfu
s
e-f
r
om-line'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
a
mano
Merge branch 'mg/use-default-abbre
v
-lengt
h
-in-rev
-
list
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Ha
m
an
o
Merge branch 'mg/
m
a
int-send-email-lazy-editor'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
ano
Merge branch 'rb/maint-pytho
n
-
p
ath'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Merge bra
n
ch 'jn/merge-diff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
an
o
Merge
branch '
e
f/cherry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
r
ge branch 'bw/template-tool-
b
uildconfig'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Ha
m
ano
Merge
br
a
nc
h
'mg/mail
m
ap-update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
b
ra
n
ch 'bc
/
t5505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
ge branch 'gh/main
t
-s
t
ash-show-error-message'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Haman
o
Me
r
g
e
b
ranch 'rs/
t
hrea
d
ed-grep-con
t
ext'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Merge b
r
anch 'bc/maint-d
a
emon-sans-ss-family
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C
Ha
m
a
n
o
M
e
rge branch 'bc/acl
-
test
'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Merge
branch 'ja/send-email-ehlo'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge bran
c
h 'do
/
re
b
ase-i-a
r
bitrary'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Hamano
Merge br
a
nch 'ak/e
v
eryday-git'
commit
|
commitdiff
|
tree
2010-04-03
Jonathan
Ni
e
der
Makefi
l
e: future-proof Cygwi
n
version c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI Tomokazu
Fix _
X
O
P
E
N
_
SOURCE
proble
m
on Dra
g
onFly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
M
a
rkus Heidelber
g
builtin/commit: remove unnece
s
s
ary variab
l
e definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Mark
u
s Heidelberg
built
i
n
/
commit: fix
duplic
a
ted sent
e
nce
i
n a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric Raymond
Integrate versi
o
n 3 ciabot sc
r
ipts into con
t
rib/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
E
r
ic
Blake
M
akef
i
le: update defaults fo
r
mode
r
n
Cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jun
i
o C Hamano
Sync with
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Ju
n
io C
H
amano
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Hamano
Merge branch
'
jc/maint-refs-dan
g
l
ing' into maint
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
Do
c
um
e
ntat
i
on: show-ref <pattern>s are optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
L
i
nk 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 redefine htonl and ntohl on
b
ig-endian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jak
u
b
Narebski
gitwe
b
: gi
t
_get
_
project
_
c
o
nfig requires onl
y
$git_di
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępie
ń
Up
d
a
t
e
d the usage str
i
n
g of git reset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
Documentation:
Cl
a
rify s
u
pport for
s
mart HT
T
P backen
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
J
oha
n
nes Sixt
Windows: fix
uti
m
e() for
r
e
a
d
-
only files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Jo
h
ann
e
s
S
i
x
t
d
i
f
f
: fix textconv error
z
o
mb
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Haman
o
Mer
g
e branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ballard
form
a
t
-
patch: Squelch 'fatal:
Not a
r
ange
.
"
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Jun
i
o C Hamano
Update draft release note
s
to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
amano
Merge b
r
anch 'cc/cherry-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C Hamano
Merge branch 'sb/notes-parse-opt'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
H
amano
M
e
r
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-29
Tho
m
as Rast
rebase -i
:
make po
s
t-rew
r
i
t
e work for
'
ed
i
t'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
mano
Prepare for 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C H
a
mano
Mer
g
e branch '
c
p/a
d
d-u-
p
athspe
c
'
i
nt
o
mai
n
t
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
Hamano
Merge br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C
Hamano
t9350: fix careless use o
f
"cd"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Aguilar
diff
t
ool: Fix '
-
-
gui' wh
e
n
d
i
ff
.
guitool is un
c
o
n
figured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sver
r
e Ra
b
belier
fas
t
-ex
p
ort
:
don't se
g
faul
t
when marks fil
e
c
a
nno
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
imap-send: suppress warn
i
ng about cle
a
rtext passw
o
rd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Michae
l
J
Gruber
send-email
:
l
azil
y
assign
e
d
ito
r
variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Hamano
Me
r
ge bran
c
h
'jh/m
a
in
t
-submodule-s
t
a
tus-
i
n-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
e
rge branch 'tr/notes-d
i
splay'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merg
e
b
ran
c
h 'jl/submodule-dif
f
-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Ham
a
n
o
Merge
branch 'pb/log-f
i
rst
-
p
a
rent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
i
o C Hamano
Merge branc
h
'
j
c/maint-refs-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
amano
Me
r
ge
b
ranch '
m
a
int'
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
m
ano
M
erge b
r
anch 'jc/col
o
r-attrs' into
main
t
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
amano
Merge branch
'
jk/main
t
-ad
d
-i
g
nored-dir
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Merge bran
c
h 'bg/apply-fi
x
-blan
k
-at-eo
f
'
into m
a
int
commit
|
commitdiff
|
tree
2010-03-24
Marc
B
ranchaud
T
e
ach rebase the -
-
no-ff option
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Shawn
O
.
Pearce
http
-
backend
:
Don't infinite loop 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
.
Tyler Ballance
Co
r
r
ect refere
n
ces to /usr/bin
/
python which does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus H
e
idelberg
Documentation: explain the
m
eaning of "-g
"
in git
-
describe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Mi
c
hae
l
J Gruber
rev-list: use defa
u
lt abb
r
ev
le
n
gth whe
n
abbrev-commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar
Ramachandr
a
i
m
ap-s
e
nd: Remove li
m
itation on
me
s
sage bo
d
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio
C
H
amano
Sync
w
ith Git
1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio C H
a
mano
Git 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Juni
o
C Hamano
M
e
rge bran
c
h 'maint-1
.
6
.
6' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grub
e
r
.
mailmap:
Map the the first su
b
missions
o
f MJG by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
ls: re
m
ove redundant logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
ye-Lund
cherry
:
support --ab
b
r
ev option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/g
i
t-clone: Tran
s
fo
r
m de
s
c
r
iption list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
G
r
u
ber
Documentatio
n
/urls: Re
m
ove spuri
o
u
s
exa
m
ple markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
G
ruber
Documen
t
a
tion
/
gitdiffcore: Rem
o
ve
m
i
sle
a
d
i
ng date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grube
r
Documentation/git-reflog: Fix formatting of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n
Nieder
merg
e
-recur
s
ive:
add a
label f
o
r
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Nieder
cher
r
y-pick, rev
e
rt: ad
d
a
lab
e
l for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
re
v
ert: clarify
la
b
el on conflict hu
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
comp
a
t: add mempcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nieder
checkout -m --conflict
=
di
f
f3: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
Nieder
merge_tree
s
(
): add
a
nce
s
tor label parameter fo
r
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n Nieder
merge_file(): add commen
t
e
x
plaini
n
g
behavior wrt conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
checkout --conflict=diff3: a
d
d
a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
i
eder
ll_m
e
rge(): add anc
e
st
o
r label pa
r
ameter
for diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
m
e
rge-file --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
xdl
_
merge():
m
ove file1 and f
i
l
e
2 labels to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
han Nieder
x
d
l_me
r
ge():
a
dd opti
o
n
al
ancestor lab
e
l to diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nied
e
r
tests:
d
ocument cherry-pic
k
behavi
o
r i
n
fa
c
e
of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
t
ests:
d
ocument format of conflic
t
s
from checkou
t
-m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J
G
ruber
.
mailmap: Ent
r
ies for Al
e
x Benn
é
e, D
e
s
kin Miller, Vi
t
aly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
N
ie
d
er
r
e
vert: fix tiny memory leak in ch
e
r
r
y-pick --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Up
d
a
te d
r
aft re
l
ea
s
e notes t
o
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Haman
o
Mer
g
e b
r
anc
h
'
j
k/ma
i
n
t
-add-ignored
-
dir'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C Haman
o
Merge b
r
anch 'ml/c
o
l
or-g
r
ep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
m
ano
Merge branch 'j
c
/c
o
lor-att
r
s'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
a
no
Merge br
a
nch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C
H
amano
Merge b
r
a
nch 'fl/ask
p
as
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
e
rge
b
r
anc
h
'bg/apply-fix-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C
Ha
m
ano
Merge branch 'bw/union-mer
g
e-refact
o
r'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
next