repo.or.cz
/
alt-git.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
Junio C Hamano
Merge branch
'jk/cher
r
y
-
pick-root-with-r
e
s
olve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge bra
n
ch 'jc/maint-
p
at
h
s
p
ec
-
stdin-
a
nd
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C
H
a
mano
Merge
1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Revert "Mer
g
e branch 'en
/
merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Ha
m
ano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Ma
k
e
f
ile: sort TEST_PROGR
A
MS list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nie
d
er
p
rovi
d
e a co
p
y of the
L
G
PLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Update
release notes
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
a
m
ano
Me
r
g
e
branch 'jc/con
v
ert'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'ci/commit--interactive-at
o
m
i
c'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
e
r
ge branch 'sg/c
o
mpletion-updat
e
s'
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
Merge branch '
k
k/maint-prefix-in-
c
onf
i
g-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'mg/merge-
f
f-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge
b
ran
c
h
'
m
aint
'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C H
a
man
o
Update draft release
n
otes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Ha
m
ano
Merge branch 'jn
/
main
t
-fo
r
mat-patch-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
H
amano
Merge
b
ranch 'ss/cherry-pick-x-doc'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
M
e
rge bra
n
ch '
v
r
/
merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branc
h
'sr/ma
i
nt-fast
-
import-tig
h
ten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'jc/t150
6
-
shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
e
rge b
r
anch
'
jc/f
i
x
-
add-u-unmerged'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch
'jn/
g
itweb-dependency' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Mer
g
e
bra
n
ch
'
j
c/maint-branch-me
r
g
eoptions' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'jc/maint-add-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
Meyerin
g
Documentation/git-fs
c
k
.
txt: fix
t
ypo: unr
e
adable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: test cherry picking
and
reve
r
ting root c
o
mmi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
r
evert:
al
l
ow
r
everting a root commi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick:
handle root commits wit
h
e
x
ternal strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Hamano
Sync rele
a
se 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
Junio
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hama
n
o
U
pdate
draft
rele
a
se 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 b
r
anc
h
'
c
n/format-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
H
a
mano
Merge branch
'
jm/
m
ergetool-submodules' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge branch 'jk/
f
ormat-p
a
tch-quot
e
-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
M
erge bran
c
h 'vh/g
i
t-svn-
d
oc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
g
i
t
_
op
e
n_noatime(): d
r
op unused para
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
sha1_fil
e
: typofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Ha
m
a
no
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jonath
a
n
Nieder
add, merg
e
,
d
iff: do not use strcasecmp to compar
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Up
d
ate
draft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'bf/commit-template-no-
c
leanup
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/t15
0
6-shell-pa
r
am
-
expansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch
'
rr/rerere-libify-c
l
ear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
am
a
no
Merge b
r
a
n
ch
'js/maint-sen
d
-pack-sta
t
el
e
ss-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Haman
o
M
e
rge branch 'jh/dirs
t
at-line
s
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Mer
g
e
branch 'jn/setup
-
revisions-gl
o
b-and-
f
riends-passthr
u
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cn/log-p
a
rse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
Ham
a
no
Me
r
ge
b
ran
c
h 'maint
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
Ham
a
n
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C Ham
a
n
o
Me
r
ge branch 'aw/
m
aint-r
e
ba
s
e
-
i-p
-
no
-
ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
e
rge branch 'js/
b
l
ame-parsena
m
e'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
ano
Merg
e
bran
c
h 'gr/c
v
si
m
por
t
-alt
e
rnativ
e
-cvspass-locat
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'cj/p4
m
erge' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
M
erge branch 'jk/m
e
rge
-
one-file-working-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Mer
g
e br
a
n
ch 'jc/fix-
d
iff-
f
iles-unmerge
d
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
a
mano
Merge branch
'
mz/maint-renam
e
-unm
e
rged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n
He
r
land
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
Me
r
ge branch
'
nd/struct-pat
h
spec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Six
t
Tweak t3
1
02-ls-tree-wildcards
t
o run on Wind
o
ws
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C
Hamano
Merge bran
c
h
'jc/mai
n
t-1
.
7
.
4-paths
p
ec-stdin-an
d
-cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
Merge branch 'jc/maint-1
.
6
.
6-path
s
pec-stdin-and-cmd
l
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
setup_re
v
isions
(
): take pathspec from comm
a
nd
l
in
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io
C
Hama
n
o
Update draft releas
e
no
t
es to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bran
c
h '
j
n/g
i
tweb-dependenc
y
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc
/
maint-branch-mergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
Merg
e
b
ran
c
h 'jn
/
m
a
int-test-me
r
g
e
-
ve
r
ify-par
e
nts'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
rge bran
c
h
'vh/config-int
e
ra
c
tive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
M
erge branch 'jc/maint-a
d
d-p-overlapping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
a
no
M
e
rge bran
c
h 'sr/maint-fast
-
i
m
port-tighten-op
t
io
n
-
p
a
r
sing'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge bran
c
h
'dm/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merg
e
branch 'jn/ct
a
gs'
commit
|
commitdiff
|
tree
2011-05-11
B
o
ris Faure
D
o no
t
strip emp
t
y lines
/
trailing spa
c
es from a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C
Hamano
Merge bra
n
ch 'fc/completion-z
s
h' into sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
J
u
ni
o
C Haman
o
R
e
v
ert "compl
e
t
i
on: don't
d
eclare 'lo
c
al words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contr
e
ras
git-comp
l
etion: fix r
e
gre
s
sion in zsh su
p
po
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Test atom
i
c gi
t
-comm
i
t
-
-i
n
teractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Add commit to list of config
.
s
i
nglekey commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwi
n
Add suppo
r
t for -
p
/--patch
t
o git-comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conra
d
I
rwin
A
llo
w
git commit --interactive with pat
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Jeff
King
t7501
.
8: feed
a
m
e
aningful co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johannes Sixt
Honor $(prefix) set in config
.
mak* when defining ETC_
G
IT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C H
a
mano
Revert "Honor $(p
r
e
f
i
x
) s
e
t in
c
o
nfig
.
m
a
k* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Hamano
co
n
vert: ma
k
e i
t
harder to sc
r
ew up add
i
n
g
a conversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
amano
c
on
v
ert: mak
e
it safer to add conversion attribut
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
n
o
c
o
nv
e
rt: give san
e
r n
a
mes to crlf/eol variables
,
types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
io C Ham
a
n
o
c
o
nvert
:
rename the
"
e
o
l" global variable
t
o "co
r
e
_
eol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
t1507
:
avoid "${
p
arameter<op>'w
o
rd'}" ins
i
de
double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jonathan Nieder
c
o
mpletion:
m
ove pri
v
ate
s
hopt shim
f
or zsh to __
g
it_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
un
i
o C Ham
a
no
t3701: add-
p
-fix makes t
h
e last test
t
o
p
ass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Hamano
rerere: libify rerere_clear() and
rerere_gc(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Conrad Irwin
Use a temporary index for git commit -
-
interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jaku
b
Na
r
e
bski
Rem
o
ve gi
t
web/gitweb
.
cgi and other legacy target
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
Jakub Narebski
gi
t
-instawe
b
: Sim
p
lify build dep
e
ndency on
gi
t
we
b
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan
Nieder
tests: chec
k
git does n
o
t ba
r
f on m
e
r
g
e
.
ff
v
alues for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonath
a
n Nieder
t
ests: teach verify_parents to 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
Junio C
H
amano
merge: introduce
m
erg
e
.
ff configu
r
ation variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C H
a
mano
Mer
g
e
branc
h
'jc/maint-branch-mergeo
p
tions' into mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
merge: make b
r
anch
.
<name>
.
m
e
r
geop
t
io
n
s c
o
rr
e
ctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
tests: elim
i
n
a
te unnecess
a
ry s
e
tup te
s
t
a
ssertions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next