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 'jk/cherry-pick-root-with-resolve'
2011-05-20
Jun
i
o C H
a
mano
Merg
e
b
r
anch
'
j
k
/
che
r
ry-pick-root-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C Hamano
Merge
b
ra
n
c
h
'jc/mai
n
t
-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merg
e
1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
unio
C
Hamano
Revert "
M
e
rge branch 'en/me
r
ge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
Makefile: sort TEST_PR
O
GRA
M
S l
i
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
provide a copy of th
e
LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Upd
a
t
e
release notes
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge br
a
nch 'jc
/
convert'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hama
n
o
Mer
g
e branch 'c
i
/commit--interactive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge bra
n
ch '
s
g/completion
-
update
s
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'kk/maint-prefix-in-config
-
mak'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
M
e
r
ge
branch
'
mg/merge-ff-
c
onfig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Update dra
f
t release note
s
to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch
'jn/mai
n
t-form
a
t-patch-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'ss
/
cherry-pick-x-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch
'vr
/
me
r
g
e
-base
-
doc' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Hama
n
o
M
e
r
ge branch 'sr/main
t
-fast-
i
mport-tighten-
o
pt
i
o
n
-parsin
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branc
h
'jc
/
t1506-shell-param-exp
a
n
s
io
n
-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/f
i
x
-add
-
u-u
n
merged
'
into
maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'jn/gi
t
web-dependency' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch
'jc
/
ma
i
nt-branch
-
m
e
rgeoptions'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
e
rge
branch 'jc/maint-a
d
d-p-overlapping-hunk
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Document
a
tion/g
i
t-fsck
.
txt
:
fix typo: unre
a
dable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t
3
503: test cherry pic
k
i
ng and reverting root commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
r
evert: allow r
e
ve
r
ting a root co
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
ch
e
rry-pic
k
:
handle
r
oot commits with ex
t
ernal strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Sync release notes for 1
.
7
.
6 to exclude what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
uni
o
C
H
amano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
no
Updat
e
draft r
e
lease
notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Mer
g
e branch 'c
n
/
f
orm
a
t-p
a
tch-qui
e
t' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge branch '
j
m/
m
ergeto
o
l-s
u
bmodules
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
M
erge branch
'
jk/
f
or
m
at-patc
h
-quote-special-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge bra
n
ch 'vh
/
g
it
-
svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
git_open_n
o
atime(): drop unused
p
arameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
sha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-15
Jonathan N
i
ede
r
add, merge, diff: do n
o
t use strcasecmp
to compar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Update dra
f
t release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'bf/commi
t
-template-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge br
a
nch 'jc/t1506-shell
-
param-expansion
-
got
c
ha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
M
e
rge bran
c
h 'rr/r
e
r
e
re-libify-clear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge
branch 'js/
m
ai
n
t
-send-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge bra
n
c
h
'jh/dirsta
t
-li
n
es'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
a
no
Merge branch 'jc/f
i
x-add-u-unme
r
ged'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
M
e
r
g
e branch 'j
n
/se
t
up-revisio
n
s
-
glob-
a
nd-friends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge
b
ranch
'
cn/
l
og-par
s
e
-o
p
t'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
Pre
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C H
a
m
ano
M
e
r
ge
branch 'aw/maint-
r
ebase-i-p-n
o
-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
no
Merge
br
a
nch 'js/blame-pa
r
sename
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Ham
a
no
Me
r
ge branch 'gr/cvsimport-alternative-cvsp
a
ss-locatio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Hamano
Merge branch 'cj/p4me
r
g
e' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch
'jk/merge-one-file-work
i
ng-t
r
ee' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
no
Merge branch 'jc/fix-diff-f
i
les-unmerged' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge b
r
a
n
ch 'mz/maint-rena
m
e-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
o
h
an
H
erland
t5400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hama
n
o
Merge branch 'nd/struc
t
-pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Johan
n
es Sixt
Tweak t31
0
2-ls
-
t
r
ee-wildcards to run on W
i
n
d
ow
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merg
e
branch 'jc/maint-1
.
7
.
4-p
a
t
h
s
pec-
s
td
i
n-and
-
c
mdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
a
m
ano
Merge br
a
n
c
h 'jc/ma
i
n
t-
1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
setup
_
revisions()
:
ta
k
e pathspec from
c
omman
d
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Update
d
raft relea
s
e
n
otes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
ranch 'jn/gitw
e
b-dep
e
ndency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
M
e
rge
branch 'j
c
/main
t
-b
r
anch-
m
e
r
geoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
M
e
r
ge branch 'j
n
/
m
a
int-test-m
e
rge-v
e
r
ify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge br
a
nch 'vh/co
n
f
i
g-int
e
ractive-sin
g
lekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge branch
'jc/maint
-
a
dd-p-overlapp
i
ng
-
hun
k
s'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
M
e
r
g
e branch 'sr/m
a
int-fa
s
t-impor
t
-tighten-option-p
a
rsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
Merge
b
ranch 'dm/ht
t
p-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
anch 'jn
/
ctags'
commit
|
commitdiff
|
tree
2011-05-11
Boris Faure
Do
not stri
p
e
m
pty lines / trailin
g
sp
a
ces f
r
om a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Ju
n
io C Hama
n
o
Merge branch 'fc/completion-
z
sh'
i
nto
sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C Haman
o
Revert "comp
l
etion
:
don't declare
'
l
ocal w
o
rds' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Felipe Con
t
reras
git-completi
o
n: f
i
x regression in zsh supp
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Co
n
rad
I
rwin
Test atom
i
c git
-
com
m
it
-
-interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Add co
m
mi
t
to list of config
.
singlekey com
m
ands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Ir
w
in
Add
s
upp
o
rt for -p/--pa
t
c
h
to git-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Co
n
ra
d
Irwin
Allow git com
m
it --int
e
ractive with
p
ath
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Jeff King
t7501
.
8: feed a meaningful comm
a
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johannes S
i
xt
H
o
nor $(prefix) se
t
i
n
con
f
i
g
.
m
ak* when defining ETC_GI
T
*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C
H
a
m
ano
R
evert "Honor $(prefix) set in conf
i
g
.
m
ak* when def
i
ning
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
c
o
nvert:
make it harder to screw up adding a c
o
n
v
ersion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hama
n
o
conve
r
t: make it safer to add c
o
nversion attributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
uni
o
C
H
a
mano
c
onvert: gi
v
e s
a
n
e
r names to crlf/eol varia
b
l
es
,
types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert:
r
enam
e
the "eol" global va
r
ia
b
le to "core_
e
ol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
m
a
no
t
1507: av
o
id
"
${par
a
meter<op>'word'}" ins
i
de
double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jona
t
han N
i
e
d
er
complet
i
on: move private shopt
s
him for zs
h
to __git_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C
Hamano
t3701: add
-
p
-fix makes
the last t
e
st to p
a
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
unio C
Hamano
r
e
r
ere: libify
r
erere_clear()
and
r
e
rere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Conrad Irwin
Use
a tempo
r
ary index for git
c
o
m
mi
t
-
-interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
aku
b
Narebski
Remove
g
it
w
eb/g
i
t
w
eb
.
cgi and other l
e
ga
c
y targe
t
s from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
kub Nar
e
bs
k
i
git-instaweb
:
Simplify bu
i
l
d
d
epe
n
d
e
ncy 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
Jo
n
atha
n
Nieder
t
ests: check git
d
o
es not b
a
r
f on merge
.
ff values f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onat
h
an Ni
e
der
tests: teach ver
i
f
y
_
p
aren
t
s
t
o check for 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
Juni
o
C Hamano
me
r
ge: int
r
odu
c
e merge
.
f
f
configurat
i
on va
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
M
erge branch 'jc/maint-branch-mer
g
e
o
ptions'
into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
merge: ma
k
e branch
.
<name>
.
mergeopt
i
ons
c
orrectly overr
i
de
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
t
e
sts: elim
i
nate un
n
ecessar
y
set
u
p
test
a
s
ser
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next