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 'jc/maint-branch-mergeoptions'
2011-05-11
J
u
nio C Ha
m
ano
Merge
b
ranch 'jc/maint-branch-mergeo
p
tions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
a
no
Merge
b
r
anch 'jn/maint-test-m
e
rge-verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
i
o C Hamano
Merge branch 'vh/config-interactive-singlek
e
y-
d
oc
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'jc/maint-ad
d
-p-
o
verlappi
n
g-hunks'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o C Hamano
Merg
e
b
r
anch
'sr/maint
-
fast
-
import-t
i
ghten-
o
ption-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
an
o
Merge
b
ranch 'dm/ht
t
p-cle
a
nup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
anch 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ham
a
no
t3701:
a
dd-p-fix
m
a
ke
s
t
h
e last test to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
t
ests:
t
each
v
e
rify_parents to
c
h
e
ck
f
or ext
r
a pa
r
e
nts
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ham
a
no
m
e
rge: make bra
n
ch
.
<na
m
e
>
.
mergeop
t
ions c
o
rrect
l
y
o
ve
r
ride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonat
h
an Niede
r
tests:
e
liminate unnecessary setup test assertio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
U
p
date dr
a
ft r
e
lease notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Haman
o
Merg
e
b
ranch 'jn/run-co
m
man
d
-error-fail
u
re'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
Hamano
Merge branc
h
'js/inf
o
-ma
n
-p
a
th'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
M
e
rge branch 'im/hashcm
p
-opti
m
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge br
a
nch 'jk/merge
-
one-file-wo
r
king-tree'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ha
m
a
n
o
Mer
g
e
branch
'j
c
/fix-dif
f
-files-un
m
e
r
ged'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'cj/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge branch 'gr/cvsimport-alterna
t
ive-cvspass-location'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Merge
b
ranch 'sg/
c
ompletion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge branch 'js/bla
m
e-
p
arsename'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Mer
g
e
b
ranc
h
'jk/forma
t
-patch-quo
t
e-specia
l
-in-fr
o
m'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anch 'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
b
ranch 'aw/ma
i
nt-rebase-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ham
a
no
Merge b
r
anch 'm
g
/alias-exp
o
se-pr
e
fix'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch 'mg
/
d
i
f
f
-uicon
f
ig-
d
oc
'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Ham
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-06
Jo
ã
o Britto
Remov
e
dup
l
ic
a
ted "
i
s a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fast-import: fix op
t
i
o
n
parser for no-arg
o
ptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Haman
o
M
e
r
ge
branch
'
maint'
commit
|
commitdiff
|
tree
2011-05-05
Val
e
ntin Haenel
git
-
reset
.
t
x
t:
b
etter docs f
o
r
'
--
p
atch'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valent
i
n H
a
enel
git-check
o
ut
.
txt: better
d
ocs fo
r
'--patc
h
'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valen
t
in
H
ae
n
el
git-stash
.
txt
:
be
t
ter docs
f
or
'
-
-
p
at
c
h
'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valen
t
in Haenel
g
i
t-add
.
txt: docume
n
t
'interactive
.
s
i
n
glek
e
y'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
c
o
nfig
.
txt: 'i
n
tera
c
tive
.
s
ing
l
ekey; is
u
s
ed
by
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here documen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
ichael J Gruber
git-fast-imp
o
rt
.
txt: --r
e
lat
i
v
e
-marks takes no parame
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima S
h
ar
o
v
shell: add missing
initialization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
ria
n
Gernhard
t
t/annota
t
e-
t
ests
:
U
se ec
h
o & c
a
t instea
d
of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Update draft
r
e
l
ease no
t
es t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
ma
n
o
Mer
g
e branch 'ml/test-readme'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ha
m
ano
Merge branch 'ft
/
gitweb-tar-with-g
z
i
p-n'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge br
a
nch 'mg/rev-list-co
u
n
t
-cherry'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge b
r
an
c
h 'ss/doc-svn'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'j
n
/format-
p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
a
no
Merge
branch 'vr/merge-base-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ha
m
a
n
o
M
e
rge branch 'ss/cherry-p
i
c
k
-
x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
erge b
r
anch '
j
n/main
t
-format-p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch '
j
k/
f
ormat-patch-multili
n
e-header'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
r
a
nch 'j
m
/m
e
rge
t
ool-submodules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
S
ync with 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C Ha
m
ano
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
Merge bra
n
ch 'j
h
/
d
irstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge b
r
anch 'sp/ma
i
nt-cl
e
ar
-
postfiel
d
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge bran
c
h 'jk/maint-sta
s
h-oob' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upl
o
ad-pack-
s
h
allow'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
M
e
rge
bra
n
c
h
'dm/
s
tash-k-i-
p
' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
amano
Merge branch 'jc/
p
ack-obj
e
cts-bigfil
e
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
b
r
anch
'mg/reflog-with-options
'
into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
M
e
rge
b
r
anch 'jk/stash-loose
n
-safe
t
y' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
Ha
m
a
n
o
Merge
branch 'ar/cl
e
an-rmdir-empty' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
amano
Merg
e
br
a
nch 'mg/sha1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
V
al
e
ntin
Haenel
git-add
.
txt: do
c
ument 'a
d
d
.
ignoreErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
T
a
y R
a
y Chu
a
n
t5541-http-push:
add test
f
or
c
hunke
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
h
t
tp-push: refactor curl_easy_setup madness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
D
a
n
McG
e
e
ht
t
p-push: use const for strings i
n
signatures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Da
n
McGe
e
http: make curl cal
l
backs match contracts from c
u
rl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Update
draft r
e
lease notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Haman
o
Merge
branc
h
'jk/notes-u
i
-
u
pdates'
commit
|
commitdiff
|
tree
2011-05-02
J
u
nio C Hamano
Merge branch
'
a
b/i18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
io
C
Hamano
Merge
b
ranc
h
'nm/submodule-update-force'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Hamano
M
erg
e
b
r
anch
'
jh/
n
otes-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge
branch
'nd/ma
i
nt-s
e
tup'
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C H
a
m
an
o
Merge branc
h
'mz/ma
i
nt-re
n
ame-unmerged'
commit
|
commitdiff
|
tree
2011-05-02
Jona
t
han
Ni
e
der
Documentation: clarify mean
i
ng of --htm
l
-pa
t
h, --man
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
J
on Seymour
git:
add --info-path an
d
-
-man-path options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
J
u
n
io C H
a
ma
n
o
Update
d
raft
release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Jun
i
o
C Haman
o
Me
r
ge branch
'
rs/strb
u
f-set
l
en-assert'
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Merge bra
n
ch 'vh/git-svn-doc'
commit
|
commitdiff
|
tree
2011-05-01
C
i
aran Jessup
Pass empty file to p4merge wher
e
no bas
e
i
s suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
uillier
Look for pa
s
s
w
ord
i
n b
o
th CVS and CVSNT pa
s
s
word files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
merge
-
one-file: fix brok
e
n merge
s
w
ith
a
l
ternate
work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
King
add tes
t
s for merge-ind
e
x
/
merg
e
-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio
C
Hamano
"add -p": work-aro
u
nd an old lazin
e
ss that
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--
i
n
t
eracti
v
e
.
perl: fac
t
or out rep
e
ated --r
e
co
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
t3701: Ed
i
ting
a
split hunk in an "add -p" ses
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add
-
p: 'q' should really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Nareb
s
ki
git
w
e
b: Mark matc
h
ed 'ctag' / contents tag (?by_
t
a
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub
Narebsk
i
gitweb: C
h
a
n
ge the wa
y
"content
t
ags" ('ctags') are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jak
u
b Na
r
e
b
ski
gitweb: R
e
structure
p
ro
j
e
c
ts li
s
t generat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
un
i
o C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Start 1
.
7
.
5
.
1 m
a
intenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
amano
Merge branch
'
m
g
/
x
-years
-
12-m
o
nths' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylv
a
i
n Rabo
t
git-sen
d
-email:
fix mis
s
in
g
spa
c
e in
error messag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh
S
tone
blame: tole
r
ate
bogus e-mai
l
addr
e
sses a
b
it better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Mathias Lafeldt
t/test-lib
.
sh: minor readab
i
lity improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jim Meye
r
ing
diffcore
-
rename
.
c
:
avoid set-but-
n
o
t-used
w
arning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Junio
C H
a
mano
Mer
g
e
b
ranch 'jc/diff-
i
rreversi
b
l
e
-del
e
te'
commit
|
commitdiff
|
tree
2011-04-28
Junio
C Ham
a
no
Merge br
a
nch '
j
c/rena
m
e-d
e
gr
a
de-cc-to-c
'
commit
|
commitdiff
|
tree
2011-04-28
Junio C
Hamano
M
erg
e
b
r
a
nch 'mz/rebase
'
commit
|
commitdiff
|
tree
next