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 Ham
a
n
o
Mer
g
e
b
r
anch '
j
k/cherry-p
i
ck
-
r
oot-with-resolve
'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
M
e
rg
e
branch 'jc/maint
-
pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
i
o C Haman
o
Rev
e
rt "M
e
r
g
e bran
c
h
'
en/merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff Kin
g
Makefile: sort
TEST_PR
O
GRA
M
S list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonath
a
n Nie
d
er
provide a co
p
y of th
e
LG
P
Lv
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Haman
o
Update release no
t
es 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 branch 'jc/co
n
ve
r
t'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
aman
o
Merge branch '
c
i/commit--intera
c
tive-atomi
c
'
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
amano
M
erge
b
r
anch 'sg/completion-updates
'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
b
ranch 'kk/maint-prefix-in-co
n
fig-mak'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o C Hamano
Merge branch '
m
g/
m
e
rg
e
-ff-con
f
ig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Haman
o
U
p
d
ate draft rel
e
ase n
o
te
s
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jn/maint-format-patch-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'ss/
c
h
err
y
-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branc
h
'vr/me
r
g
e
-
base-do
c
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Me
r
ge branch 'sr/maint-fast-import-tighten-option-pars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/t15
0
6-shell-par
a
m-expansion-go
t
cha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
anch
'jc/fix-add-u-
u
nmerged' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge bra
n
ch 'jn/gitweb-
d
epend
e
ncy
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
anch 'jc/maint-b
r
anch-mergeoptions' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'jc/maint-
a
dd-
p
-overlapping-h
u
nk
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m Meyer
i
ng
Docu
m
enta
t
ion/
g
it-fsck
.
txt:
f
i
x
t
ypo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503:
t
es
t
che
r
ry pickin
g
and
r
evertin
g
root commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: allo
w
reverting a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
h
erry-pi
c
k
:
hand
l
e
r
oot commits wit
h
external strateg
i
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Sync release notes
f
o
r 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
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Upd
a
te draft release
notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
mano
Merge bran
c
h 'cn/form
a
t
-
patch-qui
e
t
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Haman
o
Merge
branch 'jm/merget
o
ol-submodule
s
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o
C
H
amano
Mer
g
e
b
ranch
'
jk/for
m
at
-
p
a
tch-quote-special
-
in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
Merge branch 'vh/gi
t
-svn-doc'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
git_open_n
o
a
t
ime(): drop unused
paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
sha1_f
i
le
:
typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nie
d
er
ad
d
, merge, diff: d
o
not
use strcasecm
p
to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Update draft release notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch 'bf/com
m
it
-
t
emp
l
ate
-
no-c
l
ean
u
p'
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Ha
m
ano
Merg
e
branc
h
'jc/t15
0
6-shell-param-
e
x
p
ansion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'rr/rerere-li
b
ify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Merge branch 'j
s
/m
a
int-
s
end-pack-
s
t
ate
l
ess-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
am
a
no
M
erge b
r
anch
'
j
h/
d
i
r
stat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Me
r
ge
b
r
anch
'
jc/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch '
j
n
/
s
e
tup-
r
e
vis
i
o
n
s
-
glo
b
-and-friends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge br
a
nch 'cn/l
o
g-pars
e
-opt'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Pre
p
are 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 bran
c
h 'a
w
/maint-re
b
ase-i-p-no-ff'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge b
r
anc
h
'
j
s/blame-parsename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ham
a
no
Merge branch 'gr/cvs
i
mpo
r
t-al
t
ernative-cvspass
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Merge branch '
c
j/p4merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
a
m
a
n
o
Merg
e
branch 'jk/merge-on
e
-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Ham
a
no
Merge branch 'jc/fix-diff-files-unmerged'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge b
r
anch 'mz/
m
a
int-rename-unmerged'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t
5
400: Fix a coup
l
e of ty
p
os
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hama
n
o
Mer
g
e branch '
n
d/str
u
ct
-
pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
Tweak t3102-ls-tree-wil
d
c
ards to ru
n
on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merge b
r
anch 'jc/maint-1
.
7
.
4
-pathspec-stdin-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C
Hamano
Merg
e
b
r
anch 'jc/m
a
in
t
-1
.
6
.
6-path
s
pec-stdin
-
and-
c
mdline
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_rev
i
s
i
ons(
)
: take pathspec from
c
o
m
m
a
nd line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
U
p
date 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
Merg
e
b
ranch 'jn/gitweb-depend
e
nc
y
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge br
a
nch 'jc
/
maint-branch-m
e
rge
o
ptions'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
Merge branch 'j
n
/
maint-t
e
st-me
r
ge-verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hama
n
o
Merge branch 'vh
/
config-interac
t
ive-singlekey-
d
oc'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge b
r
anch
'jc/m
a
in
t
-
a
dd-
p
-overlap
p
ing-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge
bran
c
h 'sr/maint-fast-import-tig
h
ten-op
t
ion-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Hama
n
o
Merge branch 'dm/http-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C
H
amano
Merge br
a
nch 'jn
/
cta
g
s
'
commit
|
commitdiff
|
tree
2011-05-11
Boris Faur
e
Do
n
ot s
t
rip empty lines / trailing
s
paces from a com
m
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
J
unio C Hamano
M
e
rge branch 'fc/complet
i
o
n-zsh' into
sg/comple
t
io
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Revert "comple
t
i
o
n
: d
o
n't declare '
l
ocal wor
d
s' t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
git-completi
o
n: fix regression in zsh
s
u
ppor
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
C
o
n
rad Irwin
T
est ato
m
ic git-commit
-
-
i
nteractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
Irwin
Add
co
m
mit to
l
i
st of config
.
si
n
g
l
ekey com
m
ands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
I
r
w
in
Add sup
p
ort for -p/
-
-patch to git-c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Co
n
rad Irwin
All
o
w
git com
m
it --interac
t
ive with pa
t
h
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
J
e
ff King
t
7501
.
8: f
e
ed a meaningful com
m
a
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Johann
e
s Si
x
t
H
o
nor $(prefix
)
set in c
o
nfig
.
mak* wh
e
n defi
n
ing
ETC_GIT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Re
v
ert "Honor $(prefix) set in config
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Hamano
convert: make i
t
harder to sc
r
e
w
u
p
adding a convers
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
c
o
nvert: ma
k
e it safer to add conv
e
rsion a
t
tributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
amano
conv
e
rt: give
s
aner
na
m
es to crlf/
e
o
l
var
i
ables
,
types
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
ano
conver
t
: renam
e
t
h
e "eol
"
gl
o
bal variab
l
e to "core_
e
ol"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t
1507: a
v
o
id
"${parameter<op>'
w
o
rd'}" inside d
o
uble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Jonatha
n
Nieder
c
o
mpletion: move p
r
ivate sho
p
t
s
him
for zs
h
to
_
_
git_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
t3701: a
d
d
-p
-
f
i
x
mak
e
s t
h
e last t
e
st
to pas
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
J
u
n
io C H
a
mano
rerere:
l
ibif
y
rerere_clear() and rerere_gc()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Conrad Ir
w
in
Use a t
e
mp
o
rary
i
ndex for git c
o
mmit --interactiv
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove gi
t
we
b
/
git
w
eb
.
cgi
a
nd oth
e
r legac
y
t
ar
g
ets fr
o
m
.
.
.
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
git-instaweb: Si
m
plify
b
uild de
p
endency 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
Nieder
tests: check git do
e
s not
b
arf on merge
.
ff values for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
t
e
s
t
s: te
a
ch veri
f
y_parents to
check for ext
r
a 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
J
u
nio C Hamano
merge: introduce merge
.
ff confi
g
uration variabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branch 'jc/mai
n
t-
b
ranch
-
merge
o
ptions' in
t
o
mg
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hama
n
o
m
e
rg
e
: make
b
ranch
.
<name>
.
mergeo
p
ti
o
n
s
c
orr
e
ctl
y
ove
r
ride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
tests: elimi
n
ate u
n
n
eces
s
ary s
e
tu
p
test assertions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next