repo.or.cz
/
git
/
mjg.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/convert'
2011-05-16
Juni
o
C
Hamano
Merge branch 'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branch
'ci/commit--interactive-
a
tomi
c
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'sg/com
p
l
e
ti
o
n-updat
e
s'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o C Hamano
Me
r
ge b
r
anch
'kk/m
a
in
t
-prefix-
i
n-config
-
mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
ama
n
o
Merge branch 'mg
/
merge-f
f
-
c
o
n
fig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Update draft rel
e
ase n
o
tes t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
an
o
Me
r
ge
br
a
nch 'jn/
m
aint
-
forma
t
-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge
b
ranch
'
ss/ch
e
r
r
y-pick-
x
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Me
r
ge branc
h
'vr/merge-base
-
d
o
c
'
into
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
branch 'sr/
m
ain
t
-fast-import-tighten-opti
o
n-
p
ar
s
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
M
e
rge branch 'jc/t15
0
6-shell-param-expansio
n
-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge branch 'jc/fix
-
add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C H
a
m
a
n
o
Merge branch '
j
n/
g
i
t
web-depend
e
ncy'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch
'
j
c/m
a
int-branch-mergeoptions' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ham
a
n
o
Merge branch
'
jc/maint-add-p-
o
v
e
rlapping-hunks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
M
eyering
Document
a
tion/git-fsck
.
txt:
f
ix typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C H
a
mano
S
ync release notes for 1
.
7
.
6
t
o exclude what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
pd
a
te draft
release
notes
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'cn/f
o
rmat-pa
t
ch-quiet' into m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge b
r
anch 'j
m
/me
r
geto
o
l-submodules' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o C Hamano
Merge branch 'jk/f
o
rmat
-
pa
t
c
h-quote-
s
pecial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
H
amano
Me
r
ge branch
'vh/git-sv
n
-
d
o
c
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
git_ope
n
_noatime(): d
r
op unused param
e
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o
C Hamano
sha1_file: typ
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jonathan
Nieder
add,
m
erge, d
i
ff
:
do not
u
se strcasecmp to compa
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C H
a
mano
U
p
d
ate draft release notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch
'
b
f/commit-t
e
m
p
late-no-cle
a
nu
p
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branc
h
'jc/t1506-shel
l
-p
a
ra
m
-
e
xpansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'rr/rerere-lib
i
fy-cl
e
ar-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch 'js/
m
aint-send-p
a
ck-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
ch 'j
h
/
dirstat-lin
e
s'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
branch 'jc/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge br
a
nch '
j
n
/
set
u
p-revisions-glob-and-friends-
p
assth
r
u'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Mer
g
e branch
'
cn/log-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
a
n
o
Prep
a
re for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
ama
n
o
Merg
e
bran
c
h 'aw
/
maint-
r
ebase
-
i-p-no-ff' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch 'js/bl
a
me-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Me
r
ge
branch 'g
r
/cvs
i
mport-alter
n
at
i
ve-cv
s
pass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch
'cj/p4m
e
r
g
e'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge
b
r
anc
h
'jk/
m
e
rge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
Haman
o
Mer
g
e bra
n
ch 'jc/fix-diff
-
file
s
-
unme
r
ged' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
no
Merge branch
'
mz/maint-rename-
u
nmerged' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t5
4
0
0
: Fix a co
u
ple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
e
rge br
a
nc
h
'nd/struct
-
pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
Tweak t3
1
02-
l
s-tree-wildca
r
ds to run on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
Update draft release
notes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e
b
ranch 'jn/gitweb-de
p
endency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Mer
g
e branch '
j
c/maint-branch-mergeo
p
tio
n
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
ama
n
o
Merge branch
'
jn/maint-
t
est
-
merge-ve
r
ify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
a
nc
h
'vh/config-interac
t
ive-singlekey
-
doc'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
M
e
rge branch 'jc/maint-a
d
d-p-overlapping-
h
u
nks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
ranch 'sr/maint-fast
-
import-tighten-option-parsi
n
g
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch 'd
m
/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e bran
c
h 'jn/ctag
s
'
commit
|
commitdiff
|
tree
2011-05-11
Boris Faure
Do not str
i
p empty li
n
e
s
/
t
railing spaces from a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C Hamano
M
e
rge
b
ranch 'f
c
/completion-zsh' into sg/c
o
mple
t
ion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Reve
r
t "completion: don
'
t d
e
c
lare 'local w
o
rds
'
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
F
elipe Contrera
s
git-compl
e
t
ion: fix regression in
z
sh suppo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Tes
t
atomic git-commit --i
n
teracti
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conr
a
d
Irwin
Add comm
i
t
to list of co
n
f
ig
.
singlek
e
y c
o
mmand
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
I
rwin
Add suppo
r
t for -
p
/--patch to git-com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
I
r
win
A
l
l
ow git commit --interactive with paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Jeff King
t7501
.
8: fee
d
a meaningful com
m
a
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johannes Sixt
Honor $(prefix) set in config
.
mak* whe
n
defini
n
g ETC_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
i
o
C Hamano
Reve
r
t "Honor $(prefix) set i
n
confi
g
.
ma
k
*
when
defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
c
o
n
v
ert: make it harder to screw
u
p addi
n
g
a con
v
ersion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
convert:
make it safer to add conversion attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Hamano
con
v
ert: give
sane
r
name
s
to crlf/eol
varia
b
les,
types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
c
onv
e
rt: rename the "eol" global v
a
riable to "core
_
eol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Ham
a
no
t1507
:
avoid "${parame
t
er<op>'wor
d
'}" inside
doub
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jonathan Nieder
complet
i
o
n: m
o
v
e
private shopt shim for
zs
h
t
o __git_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
unio C Hamano
t3701: add
-
p-fix make
s
the last test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hama
n
o
rerer
e
: lib
i
fy rerere_clear() and rer
e
re_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
C
on
r
ad
I
rwin
Use a tem
p
orary index for
git commit --in
t
eractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove
gitweb/gitwe
b
.
cg
i
a
nd other
lega
c
y targets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebsk
i
git-instaweb: Simplify bu
i
ld depende
n
cy on
g
i
tweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonat
h
an Nied
e
r
tests:
check git does not barf on merge
.
f
f
values
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onathan Nieder
t
e
st
s
: t
e
ac
h
veri
f
y_par
e
nts to check for
extra paren
t
s
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
merg
e
:
intro
d
uce merge
.
f
f
configu
r
a
t
ion va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge branch
'
jc/maint-
b
ranch-mergeoptio
n
s' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
J
unio
C
Hamano
me
r
ge: make
b
r
anch
.
<name>
.
mergeoptions
c
or
r
ectly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onathan Nieder
tests: eliminate
unnecessary setup test assertions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
H
a
mano
Upda
t
e
draft
release notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'jn/run-command-er
r
or-failure'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
H
a
m
a
no
M
erge br
a
nch 'js/inf
o
-man-pa
t
h'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
b
ranch '
i
m/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anch
'
jk/merge-one-f
i
le-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
H
a
mano
Mer
g
e
b
ranch 'jc/fix-diff-files-unm
e
rged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch '
c
j/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge bra
n
ch 'g
r
/cvsimport-al
t
ernativ
e
-cvspass-locat
i
on'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
ano
Merge branch 'sg/completi
o
n-clea
n
up'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge
b
ranch '
j
s/b
l
ame
-
p
a
rsename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branc
h
'jk
/
forma
t
-patch-
q
uote-
s
pecial
-
i
n-fro
m
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Haman
o
Merge branch 'n
d
/stru
c
t
-
pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
H
amano
Merge branch 'aw/main
t
-rebase-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio
C Hamano
M
e
rg
e
branch 'mg/alias-expose-pref
i
x'
commit
|
commitdiff
|
tree
next