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
Junio C Hamano
Merge
branch 'mb/r
e
base-
i
-no-f
f
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ham
a
no
Merge
b
ranch 'sp/
m
aint-
h
ttp-backend-die-trig
g
ers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C Hamano
Merge branch 'r
r
/imap-se
n
d-unconfuse
-
f
r
om-li
n
e'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Me
r
g
e br
a
nch 'mg/use-
d
efault-abbrev-leng
t
h-in-rev-
l
ist'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge
branch
'mg/maint-send-em
a
il-l
a
zy-edi
t
or'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
ge
branch 'rb/maint-python-path'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio
C
Hamano
Merg
e
bra
n
ch 'jn/m
e
rge-diff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
an
o
Merge bran
c
h '
e
f/cher
r
y-
a
bbrev'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Merge branch
'
bw/tem
p
late-t
o
ol-buildcon
f
ig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
ano
Merge br
a
nch '
m
g
/
mailm
a
p
-
u
p
d
at
e
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Ha
m
a
no
Merge branch 'bc/t5505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C Ha
m
ano
M
e
rge branch
'g
h
/maint-stash
-
s
how-error-me
s
sage'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C
H
a
m
a
no
Merge branch 'rs/threaded-grep-c
o
ntext'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge
b
ranc
h
'bc/
m
aint
-
daemon-sans-
s
s-family'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C
Hamano
Merge branch 'bc/
a
cl-te
s
t'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Haman
o
Me
r
ge b
r
a
n
c
h 'j
a
/send-
e
mail-ehl
o
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
am
a
n
o
Merge br
a
nc
h
'do/reb
a
se-i-arbitrary'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge b
r
anch 'ak/ever
y
day-git
'
commit
|
commitdiff
|
tree
2010-04-03
Jona
t
han
Nieder
Ma
k
efile: future-proof Cyg
w
in ver
s
ion check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
YO
N
ET
A
N
I Tomokazu
Fix _X
O
PEN_SOUR
C
E
p
ro
b
lem on
Dra
g
onFly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heid
e
l
berg
builtin/co
m
m
i
t
: remove un
n
ec
e
s
s
ary
var
i
able def
i
ni
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Marku
s
Heidel
b
er
g
builtin
/
c
o
mmit: f
i
x du
p
licated sentence
i
n
a comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric Raym
o
nd
I
n
t
egra
t
e v
e
rsion 3 ciabot sc
r
ipts into
con
t
rib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric Blake
Makefile:
upda
t
e defaults for modern Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C
Hama
n
o
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 Haman
o
Git 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Hamano
Merge
b
ranch 'jc/main
t
-refs-da
n
g
l
ing' into maint
commit
|
commitdiff
|
tree
2010-03-31
H
olger Weiß
Documentati
o
n: s
h
ow-re
f
<pattern>
s
are op
t
iona
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Wei
ß
Lin
k
against libiconv o
n
IRIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger We
i
ß
D
o
n't r
e
d
e
fine htonl and ntohl on big-e
n
dian
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Ja
k
ub Narebs
k
i
g
i
tweb: git
_
ge
t
_project_config requires only $gi
t
_dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
an Stę
p
ień
Updated the usage string of
git
r
eset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
Docum
e
n
t
at
i
on: Clarify support for smart
H
TTP
b
a
ckend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Windows: fi
x
utime() for rea
d
-only files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Joh
a
nnes
Sixt
diff:
f
i
x
t
e
xtconv e
r
ror
z
ombies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Ju
n
io C Hamano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-30
Ke
v
in Bal
l
ard
format-patch: Squelch 'fatal: No
t
a rang
e
.
"
erro
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Ham
a
no
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
Junio C
H
amano
Merge b
r
an
c
h 'cc/cherry-pick-
f
f'
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
ma
n
o
M
e
rge br
a
nch
'
sb/notes-pa
r
se-opt'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Tho
m
a
s
Rast
reba
s
e -
i
: make pos
t
-r
e
write
w
o
rk for 'edit'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Pr
e
pare 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 Hamano
Merg
e
branch 'cp/add-u-pathspec' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hama
n
o
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Hamano
t935
0
: fix careless use of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguil
a
r
difftool: Fix '--gui' whe
n
d
i
ff
.
g
u
itool is unconfigured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
S
v
erre Rabbelier
fast-export: don't
s
e
gfault whe
n
marks file
cann
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
C
hris W
e
bb
imap-s
e
n
d: suppress warning about
cle
a
r
text password
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Mi
c
ha
e
l J
G
ru
b
er
send
-
email: lazily
a
ssign edi
t
or variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch '
j
h/maint-submodule
-
statu
s
-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
b
ranch '
t
r/
n
ot
e
s-disp
l
ay'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C H
a
man
o
Merge branch 'jl/su
b
module-diff
-
dirtines
s
'
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o
C
Hamano
M
e
rge branch 'pb/log-f
i
r
s
t
-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io
C
Hamano
Merge branch 'jc
/
m
a
int-refs-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
ge
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Hamano
M
e
rge branch 'jc/c
o
lor-attr
s
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
Merge
branch 'j
k
/maint-add
-
ignored-dir' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C H
a
mano
Merge
b
ranch 'bg/apply-fix-b
l
ank-at
-
eof' into
m
aint
commit
|
commitdiff
|
tree
2010-03-24
Marc Branchaud
T
e
a
c
h
r
e
base
t
h
e --no-ff option
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Shaw
n
O
.
Pearce
http-
b
ackend: D
o
n'
t
infinite loop
d
uring 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
C
o
rrect references to
/
u
sr/b
i
n
/p
y
thon
w
hich d
o
es not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Markus H
e
idelberg
D
o
cum
e
ntation: exp
l
a
i
n
th
e
meaning of "-
g
" in git-describe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mich
a
el J Gruber
re
v
-
l
ist: u
s
e de
f
a
u
l
t abbrev
length whe
n
abbrev-commi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar Ramachan
d
ra
imap
-
send: Remove limitation
on messag
e
body
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Sync with Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio 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 branch '
m
aint-1
.
6
.
6' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Grube
r
.
m
ailmap: Map the the first
s
ubmissi
o
n
s
of MJG by
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
E
r
i
k
Faye-
L
und
ls: remov
e
redun
d
ant logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik F
a
y
e
-Lund
cherry: su
p
port --ab
b
rev option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gru
b
er
Documentation/git-
c
lone: Tran
s
form descript
i
on list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J Gr
u
be
r
Documentation/u
r
ls:
Remove
spurious example
m
arkers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J
G
r
uber
Documentat
i
on/
g
itdiffcor
e
: Remo
v
e
mislead
i
ng date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gruber
D
o
cument
a
tion/git-reflog: Fix formatting of command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
Nie
d
e
r
merge-recur
s
ive: add
a labe
l
for a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an N
i
eder
ch
e
rry-pic
k
, revert: a
d
d a la
b
e
l for
ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
revert
:
clarif
y
l
abel on
conflict
h
unks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
c
om
p
at
:
add
m
emp
c
py()
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
for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_trees(): ad
d
ancestor labe
l
p
arameter for diff
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
merge_fil
e
(): add
c
omm
e
nt
explaining be
h
avior wrt con
f
l
i
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an
Nieder
che
c
kout
--
c
o
n
flict=diff3: add a label fo
r
an
c
estor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
ll_merge(): add ancesto
r
l
abel parame
t
er
f
or d
i
ff
3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
mer
g
e-file --dif
f
3: add a
l
a
bel for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): move file1 a
n
d
file2 labels to
x
mpa
r
am
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge():
add
o
ptional ancestor label to diff3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
te
s
ts:
d
ocu
m
ent
ch
e
r
ry-p
i
ck
b
ehavior in face of con
f
li
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
tests: docum
e
nt format
of conflicts
from che
c
kout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michae
l
J Gruber
.
mailmap: Entrie
s
for
Alex
Bennée, D
e
s
kin Miller, Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
revert:
f
i
x
t
i
ny memory
leak in cherry-pic
k
--f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft rel
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 Hamano
Merge bran
c
h 'jk/maint-ad
d
-ignor
e
d-dir
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'ml/colo
r
-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Me
r
ge bran
c
h 'jc/co
l
or-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
M
erge br
a
n
c
h 'cc/rese
t
-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Ham
a
no
M
e
rge
branch 'f
l
/as
k
pas
s
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Me
r
ge branch '
b
g
/app
l
y-fix
-
bla
n
k-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
M
erge branch
'
b
w/union-merge-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Ha
m
ano
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
next