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 'jk/mergetool-lib-refactor'
2013-06-24
Junio C Ham
a
no
Merge branch
'
jk/m
e
rgetool-lib-refa
c
t
o
r'
commit
|
commitdiff
|
tree
2013-06-24
Junio C H
a
mano
Merge
branch 'jk
/
doc-bu
i
ld-m
o
ve-i
n
fordir-def'
commit
|
commitdiff
|
tree
2013-06-24
Junio C Hamano
Merge br
a
nc
h
'fg/su
b
mo
d
u
le-fixup'
commit
|
commitdiff
|
tree
2013-06-24
Junio C Ha
m
ano
Merge
br
a
nch '
d
k/version-gen-gitdir'
commit
|
commitdiff
|
tree
2013-06-24
Junio C Hamano
Mer
g
e branch '
d
k/ma
i
nt-t5150-dirname
'
commit
|
commitdiff
|
tree
2013-06-24
Junio
C
Ha
m
an
o
Merge branch
'
rs/unpack-trees
-
tree-wal
k
-
conflict-field'
commit
|
commitdiff
|
tree
2013-06-24
Junio C Hamano
M
e
r
ge branch 'rr/reba
s
e-sha1-by
-
string-query'
commit
|
commitdiff
|
tree
2013-06-24
Juni
o
C Haman
o
Merge branch 'mm/r
m
-coalesce
-
errors'
commit
|
commitdiff
|
tree
2013-06-24
Junio C Hamano
Merge branch 'jh/libify-
n
ote
-
handling'
commit
|
commitdiff
|
tree
2013-06-24
Ju
n
io C Hamano
Merge b
r
anch 'fc/se
q
uencer-plug-lea
k
'
commit
|
commitdiff
|
tree
2013-06-24
Ju
n
io C Ha
m
ano
Revert "Merge branch 'jg/st
a
tus-conf
i
g'
"
commit
|
commitdiff
|
tree
2013-06-23
Juni
o
C Hama
n
o
Up
d
ate
d
raft release
notes to 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-23
Junio
C
Ha
m
ano
Merge
b
r
a
nch 'mz/rebase-tests'
commit
|
commitdiff
|
tree
2013-06-23
Junio C Hamano
Merge
bra
n
ch
'jk/unp
a
ck-entry-fall
b
ack-to-anot
h
er'
commit
|
commitdiff
|
tree
2013-06-23
Jun
i
o C H
a
mano
Merge b
r
anch 'jk/apache
-
test-f
o
r-2
.
4'
commit
|
commitdiff
|
tree
2013-06-23
Junio C Hama
n
o
Merge branc
h
'cm
/
remote-mediawiki-pe
r
lcritiq
u
e'
commit
|
commitdiff
|
tree
2013-06-23
Ju
n
i
o C Hama
n
o
Mer
g
e branc
h
'bp/
r
emote-mw-
t
ests'
commit
|
commitdiff
|
tree
2013-06-23
Junio
C
Hamano
M
e
rge bran
c
h 'rr/rebase-autostash'
commit
|
commitdiff
|
tree
2013-06-23
Junio C Ha
m
ano
Merge branc
h
'
r
r/p
r
ompt-rebase-
b
reakage-fi
x
'
commit
|
commitdiff
|
tree
2013-06-23
J
uni
o
C Ham
a
n
o
Merge branch
'
jg/
s
tatus-config'
commit
|
commitdiff
|
tree
2013-06-21
Jeff Ki
n
g
l
i
b-httpd/apache
.
conf:
c
h
eck version only after mo
d
_vers
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-21
Junio C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2013-06-21
Jeff K
i
ng
transport-helper
:
be quiet on re
a
d errors from helpers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-21
Ramkum
a
r Ramachan
d
ra
co
m
pletion: complete diff -
-
word
-
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-20
J
u
nio C
Ham
a
no
Update draft releas
e
notes
to
1
.
8
.
4
commit
|
commitdiff
|
tree
2013-06-20
J
u
nio C Hamano
Merge
b
ran
c
h 'cm/rem
o
t
e-mediawi
k
i'
commit
|
commitdiff
|
tree
2013-06-20
Junio
C
Ha
m
ano
Merge branch
'rs/match-
t
r
ees-ref
a
ctor'
commit
|
commitdiff
|
tree
2013-06-20
Junio C Hamano
Merge branc
h
'rs/logical-vs-binary
-
o
r
'
commit
|
commitdiff
|
tree
2013-06-20
Jun
i
o
C
Hamano
Merge branc
h
'mm/
c
olor-auto-d
e
fault
'
commit
|
commitdiff
|
tree
2013-06-20
J
u
nio C
Hamano
Merge branch 'rs/discard-inde
x
-
d
isca
r
d-array'
commit
|
commitdiff
|
tree
2013-06-20
Junio C Hamano
Merg
e
bran
c
h 'nd
/
traces'
commit
|
commitdiff
|
tree
2013-06-20
Junio C Hamano
Merg
e
branch 'fc/sh
o
w-non-empty-errors-in-
t
est'
commit
|
commitdiff
|
tree
2013-06-20
Junio
C
Ha
m
a
n
o
Merge branch 'fc/m
a
kefil
e
'
commit
|
commitdiff
|
tree
2013-06-20
Junio C Hamano
Merge bra
n
ch
'
js/test-ln-s-add'
commit
|
commitdiff
|
tree
2013-06-20
J
u
n
io
C
Hamano
Merge branch 'nd/make-wildmatc
h
-defaul
t
'
commit
|
commitdiff
|
tree
2013-06-18
Johannes Sixt
rebase topology tes
t
s: fix commit n
a
mes on case-ins
e
nsiti
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
Fredrik Gustafss
o
n
git-
s
ubmodule
.
sh:
r
emov
e
duplic
a
te call
t
o set_rev_name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n
Keeping
mergetool--lib: re
f
actor {diff,merge
}
_cmd logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
Do
c
ument
a
tion/Makefile: move i
n
fodir
to be w
i
th other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eep
i
ng
Docu
m
entation/Makefi
l
e: f
i
x spaces ar
o
und assignments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
Denni
s
Kaa
r
sema
k
e
r
G
I
T
-VERS
I
ON-
G
EN:
supp
o
rt non
-
standard $GIT_D
I
R
path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
Denn
i
s Kaarsemak
e
r
tests
:
all
o
w
s
ha1'
s
as
p
art of the path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
René S
c
harfe
unpack-trees: don't shif
t
conflicts left a
n
d right
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-17
J
unio
C Hamano
Merge tag
'
gi
t
gui-0
.
1
8
.
0' of
git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2013-06-16
J
orge Juan Garcia
.
.
.
status: introduce status
.
b
r
anch t
o
e
n
a
ble -
-
branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-16
Jun
i
o
C
Hamano
Update
d
ra
f
t relea
s
e no
t
es to 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
J
eff King
unp
a
c
k_entry: do not die when we
f
ail to apply a
d
elta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
J
eff K
i
ng
t5303: dr
o
p "
c
ount=1" from cor
r
uption dd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
B
enoit
P
erson
git-rem
o
te-medi
a
wik
i
: remove hardcoded
v
ersion num
b
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Jeff King
t/lib
-
h
t
tpd/apache
.
c
o
nf
:
co
n
figure an
MP
M
modul
e
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Jeff King
t/lib-httpd
/
apache
.
conf: load compat ac
c
e
ss
module
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Jef
f
King
t/
l
ib-httpd/apache
.
conf: load
e
xtra au
t
h modules i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Jeff
King
t/lib-httpd/apache
.
conf: do not
u
se LockFi
l
e
in apache
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Ra
m
k
u
mar
R
amac
h
andra
reb
a
se: use peel_commi
t
tish() w
h
ere
appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Ramkumar Ra
m
a
chandr
a
sh
-
setup: add new peel_committish() helper
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Ramk
u
m
ar
R
a
machandra
t/r
e
base
:
add fai
l
ing tests for a
p
eculi
a
r revisio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
é
lestin Matte
git-
r
e
mo
t
e-me
d
iawik
i
: ma
k
e err
o
r
m
essage more pre
c
ise
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin
M
a
t
te
g
i
t-rem
o
te-m
e
diawiki: add
a
p
e
rlcritic rule in Make
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Ma
t
te
git-remote-m
e
diawiki: add a
.
perlcriticrc fil
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célesti
n
Matte
git-remote-mediawi
k
i: c
l
early rewrite
d
o
u
bl
e
d
ereference
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
éles
t
in
M
a
t
te
g
it-remote-mediawiki: fix
a
typo ("med
i
wiki" instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin M
a
tte
git-remo
t
e-media
w
iki: put non-trivial numeric values
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin
M
atte
git-remote-mediawi
k
i: do
n
't use quot
e
s fo
r
empty st
r
i
ngs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célesti
n
Matte
git-re
m
ot
e
-media
w
i
ki: replace "u
n
le
s
s" statemen
t
s with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Matte
g
i
t-remote-mediawiki: br
a
ce
f
i
le
handles for print
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
é
lesti
n
Ma
t
te
git-remote-
m
ediawiki: modify strings for a better
cod
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
élest
i
n Matte
git-re
m
ote-mediawiki: put long
c
ode int
o
a subroutine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Céles
t
in Matt
e
g
it-rem
o
te-media
w
i
ki: remove
import of un
u
sed open2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Cél
e
stin Matte
g
i
t-
r
em
o
te-mediawiki: chec
k
return value
o
f
op
e
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Matt
e
git-remote-mediaw
i
ki
:
assign a va
r
iable as undef and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
é
lestin Matte
git-remote-med
i
awiki: ren
a
me
a va
r
iable ($last) wh
i
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Cé
l
e
st
i
n
Matte
git-rem
o
t
e
-
mediawiki:
r
emo
v
e unused variab
l
e $entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Cé
l
estin Matte
g
i
t-re
m
ote-mediawiki:
tur
n
d
o
uble
-
negated expres
s
ions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Cél
e
st
i
n Matte
git
-
remot
e
-
m
edi
a
wiki
:
change the name of
a varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Matte
gi
t
-
r
e
m
o
t
e-mediawiki:
add newline in the en
d
of die
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Matte
g
it-remote-mediaw
i
k
i
: c
h
a
nge
s
tyl
e
in a
r
e
gexp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin
M
atte
git-remote-me
d
iawi
k
i
: c
h
ange style in
a
regexp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Ma
t
te
git-remote-media
w
ik
i
:
c
h
ange
separator
o
f
some regexps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
él
e
stin Matte
git-remote-me
d
iawiki
:
change the behav
i
our of a split
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin Matte
g
i
t-remote-m
e
diawiki
:
rem
o
ve use
l
ess
r
e
g
e
x
p modifier (m)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célestin M
a
tte
g
it-remote
-
mediawiki:
rew
r
ite
unc
l
ear line
o
f instructions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célesti
n
Matte
git-r
e
mot
e
-medi
a
wiki: change syntax of map calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Céles
t
in Matt
e
git-re
m
o
t
e-medi
a
wiki
:
move a
variable
d
eclar
a
tion at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
élesti
n
Matte
git-remote-m
e
diawiki: alway
s
end a
s
ubrou
t
ine
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Célest
i
n Matte
git-remot
e
-mediawiki: replace :
u
tf8 by :enco
d
in
g
(U
T
F-8)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Cél
e
stin Matte
git-remote-mediawiki
:
move "use warn
i
n
g
s
;"
before any
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
C
é
lestin Matte
git-remote-mediawi
k
i: make a regexp
c
le
a
rer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-14
Junio
C Hamano
Me
r
ge bran
c
h 'rr/complete-di
f
f
t
ool-
f
ix
u
p
'
commit
|
commitdiff
|
tree
2013-06-14
Jun
i
o
C Hamano
M
erge
branch '
m
t/s
e
nd
-
email
-
cc-match-f
i
x
'
commit
|
commitdiff
|
tree
2013-06-14
Junio C Hamano
Merge bra
n
ch
'bp/mediawiki-credential'
commit
|
commitdiff
|
tree
2013-06-14
Ju
n
i
o
C
H
amano
Merge branch 'mh/reflife'
commit
|
commitdiff
|
tree
2013-06-14
Junio C Ha
m
ano
Merge b
r
anch 'kb/full-history-compute-tree
s
ame
-
car
e
fully-2
'
commit
|
commitdiff
|
tree
2013-06-14
J
u
nio C Hamano
Merg
e
b
ranc
h
'rr/remove-contrib-some'
commit
|
commitdiff
|
tree
2013-06-14
Ramkumar Ramachandra
p
r
ompt: squelch error outp
u
t from cat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-13
Ramkumar Ramachandr
a
rebase: finish_rebase() in
n
o
o
p reba
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-13
Ramk
u
mar Rama
c
han
d
ra
rebase: finish_re
b
a
se() in fast-f
o
rward rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-13
Ramkuma
r
Ramachandra
rebase: guard
a
gainst missing
f
ile
s
in read_basic
_
state
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-13
Ren
é
Scharfe
use logica
l
OR (|
|
) instead of binary OR (|) in l
o
gi
c
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-13
René Sc
h
a
rfe
m
atch-tr
e
es:
f
a
c
tor out fill_t
r
ee_des
c
_st
r
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-06-12
M
at
h
ieu Lienard
.
.
.
rm: introduc
e
advice
.
rmHint
s
to
s
horten
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next