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
Junio C Hamano
Merge branch 'jc/c
o
n
v
ert'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
ranch
'ci/commit--interactive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge bran
c
h 'sg/completi
o
n-updates'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
Merge branch 'kk/maint-prefix-in-config-mak
'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o C Hamano
Mer
g
e branch '
m
g/
m
erge
-
ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ran
c
h
'
maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
U
pdate d
r
aft release notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C H
a
mano
Mer
g
e b
r
anch 'jn/maint-format
-
patc
h
-doc'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C H
a
mano
Me
r
ge
b
ranch 'ss/cherry-pick-
x
-doc'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
erge branch '
v
r
/merge
-
bas
e
-
d
oc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
Merge b
r
anch 's
r
/mai
n
t-fa
s
t-i
m
port
-
tighten-
o
p
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge
bra
n
ch 'jc/t15
0
6
-
shell-para
m
-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Hamano
Merge
b
ranch 'jc/fix
-
a
dd-u-unmerged'
i
n
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge br
a
nc
h
'jn/
g
itweb-
d
ependen
c
y'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge bran
c
h
'
jc/main
t
-b
r
anch-mergeop
t
io
n
s' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Me
r
g
e
b
r
a
nch '
j
c
/ma
i
nt-add-p-ov
e
rl
a
p
p
i
ng-hunk
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documenta
t
ion/git-f
s
ck
.
txt
:
f
i
x typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
n
o
Sync relea
s
e
n
otes
f
or 1
.
7
.
6 t
o
e
x
clude wha
t
a
r
e
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
m
an
o
Up
d
a
te d
r
aft
release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge branc
h
'cn/format-p
a
tch-quiet'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
J
uni
o
C H
a
mano
Merge branch 'jm
/
mergetool
-
submodules'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'j
k
/f
o
rmat-patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C H
a
mano
Merge branc
h
'
v
h
/git-sv
n
-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
git_open_noati
m
e(): drop
u
nused para
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
sha1_file: typo
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
a
than Nieder
a
dd, merge, di
f
f: do not use str
c
asecmp to
compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Update
d
raft release n
o
tes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge bra
n
ch 'bf/comm
i
t-te
m
plat
e
-
n
o-
c
leanup
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch 'jc/t1
5
0
6
-
shell-param-expans
i
on-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branc
h
'rr/rere
r
e-libi
f
y-
c
lear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch
'
j
s
/maint-send
-
p
a
c
k-stat
e
less-rp
c
-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'jh/
d
irstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch 'jc
/
fix-add-u-
u
nmerge
d
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merg
e
branch 'jn/setup-r
e
v
i
s
ion
s
-
g
lob-and-friends-p
a
ss
t
hru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branc
h
'cn/
l
og-par
s
e-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
P
repare
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch 'aw/ma
i
n
t
-rebase-i-p-no-ff' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Ha
m
a
no
Merge
b
ran
c
h 'js/b
l
a
m
e-parsename' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bran
c
h 'gr/cvsimport
-
alter
n
ative-
c
vspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branc
h
'cj
/
p
4
merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e br
a
n
c
h 'jk/merge-o
n
e-fi
l
e-working-
t
r
e
e
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'jc/fix
-
diff
-
files-
u
nme
r
ge
d
' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C
Ham
a
n
o
Merge
b
r
anch 'mz/maint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t5400: Fix
a
couple
o
f
typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'nd/st
r
uct-pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Johan
n
e
s
Sixt
Twe
a
k t3102-
l
s-tree-wildcards to run on Win
d
ows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Update draft
relea
s
e notes
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
Merge branch 'jn/g
i
tweb-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merg
e
b
ranch 'jc
/
maint-branch-mergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
an
o
Merge b
r
a
nch 'jn/m
a
int-test-merge-verify-
p
arents
'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io
C
Hamano
Me
r
g
e
b
r
an
c
h 'vh/confi
g
-i
n
terac
t
ive-singlek
e
y-d
o
c'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
Merge branch '
j
c/maint-add-p-
o
verlapping-hunk
s
'
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
Hamano
Merge
branch 'sr/ma
i
nt-fast-import-t
i
gh
t
en-op
t
ion-parsi
n
g'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Ham
a
no
M
erge br
a
nch 'dm/http-cle
a
n
u
p'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge bran
c
h 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-11
B
o
r
i
s Fau
r
e
Do
n
o
t
s
trip
empty lines / trailing spaces
f
rom a commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Merge br
a
nch '
f
c
/
c
ompletion-zsh' i
n
to s
g
/complet
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C Hama
n
o
Revert "comple
t
io
n
: d
o
n't
d
eclare 'local words'
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Felip
e
Contre
r
a
s
git-completion
:
fix re
g
r
e
ss
i
on in zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Test a
t
omic git-
c
ommit --int
e
ractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
I
rwin
Add commit to
l
ist of
config
.
sing
l
e
k
e
y comm
a
nds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
C
o
nrad
Irwin
Add sup
p
ort for -p/--pa
t
ch to git-comm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Con
r
ad Ir
w
in
Allow g
i
t commit --inter
a
ctiv
e
w
i
th paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Jeff King
t7501
.
8: feed a mean
i
ngful
c
ommand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Joh
a
nnes
Sixt
Honor $(prefix) set in config
.
ma
k
*
w
hen d
e
fining ETC_GIT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
a
mano
R
e
vert
"Honor $(pref
i
x)
s
et
in con
f
i
g
.
mak* whe
n
de
f
ining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
uni
o
C
Hamano
convert:
mak
e
it ha
r
der
t
o screw up adding a conv
e
rsi
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
a
m
a
no
conver
t
: make it
safer
t
o
a
d
d
conversion attributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
ni
o
C Hamano
c
onve
r
t
: giv
e
saner names
t
o
c
rlf/eol
v
ariabl
e
s
,
types
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Ham
a
no
conv
e
rt:
r
ename the "
e
ol" glo
b
al v
a
riable to "core_eol"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
Hama
n
o
t1507: avoid "${parameter<op
>
'wo
r
d'}"
insi
d
e double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Jona
t
han Nieder
completion:
m
o
v
e p
r
ivate shopt
shi
m
f
o
r zsh to
__
g
it_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jun
i
o C Hamano
t3701: add-
p
-fix make
s
the
l
ast test to p
a
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ha
m
a
no
rerere: libify rere
r
e_cle
a
r() and rerere_gc()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Conrad Irwin
Use a
t
emporary in
d
ex for git commit --i
n
te
r
ac
t
ive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebs
k
i
Remove gitweb/gitweb
.
cgi and other legacy
t
a
rgets 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
N
arebski
git-instaweb: Simplify build
depende
n
cy on gitweb
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonatha
n
Nied
e
r
tests: check git does
n
ot barf on merg
e
.
ff valu
e
s for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan
Nieder
t
e
sts: tea
c
h
verify_parents to check fo
r
extra parents
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
m
e
rge: introduce merge
.
ff confi
g
uration variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Ham
a
no
Mer
g
e branch 'j
c
/maint
-
branch-
m
e
r
geoptions' i
n
to mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
merg
e
: make b
r
anch
.
<name>
.
mergeop
t
ions co
r
rectly over
r
ide
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonat
h
an Ni
e
d
er
tes
t
s: eliminate unnecessary s
e
tup test assertions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Haman
o
Update draft release n
o
tes 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/ru
n
-com
m
a
n
d-
e
r
r
or-failure'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hama
n
o
Merge br
a
nch
'js/info
-
ma
n
-
path
'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C
Hamano
Merge bran
c
h 'im/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
Me
r
ge
br
a
nch 'jk/m
e
rge-
o
ne-file-working-t
r
ee'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge
bra
n
ch 'j
c
/fix-dif
f
-files-u
n
merged
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
mano
M
e
rge br
a
nch 'cj/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch 'gr/
c
vsimport-alt
e
r
native-cvspass-location'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'sg/completion-cle
a
nup
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io
C
Ham
a
n
o
Merge br
a
n
c
h
'
js/blame-parsename'
commit
|
commitdiff
|
tree
2011-05-06
J
unio
C
Haman
o
Merge branch 'jk/
f
ormat-patch-q
u
o
te-sp
e
cial-in-fro
m
'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hama
n
o
Merge branch
'
n
d
/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merg
e
b
ranch 'aw/m
a
int-rebase-i-p-
n
o-f
f
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge branch
'mg/alias-expose
-
pr
e
fix'
commit
|
commitdiff
|
tree
next