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 git://git.bogomips.org/git-svn
2012-04-30
J
unio C
Hamano
Mer
g
e git:/
/
git
.
bogomips
.
or
g
/g
i
t-svn
commit
|
commitdiff
|
tree
2012-04-27
Junio C Haman
o
Th
e
sixth batch of topics gradu
a
ted
to
'
master'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C H
a
mano
Merge
b
r
a
nch 'jc
/
merge-reduc
e
-paren
t
s-early'
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-04-27
Junio
C
Hamano
Merge
br
a
n
ch 'js/f
a
st-im
p
o
rt-tes
t
-9300
'
commit
|
commitdiff
|
tree
2012-04-27
J
u
nio C Hamano
Merg
e
b
r
a
nch 'rt/cherry-revert-conflict-summa
r
y'
commit
|
commitdiff
|
tree
2012-04-27
Junio C H
a
mano
Merge
b
ranch
'
c
b
/maint-report
-
mou
n
t-point-c
o
rre
c
tly
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Junio C Ha
m
a
n
o
Merge branch 'cb/cherr
y
-pick-rev-path-co
n
fusion'
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hama
n
o
Mer
g
e branch 'cb/http
-
m
ulti-curl-auth'
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Update draft release no
t
es to 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C H
a
m
a
no
Merge branch 'rl/maint-
s
tash-i18n-save-erro
r
'
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio
C H
a
mano
Merge
branch '
m
b
/fetch-call-a-non-branch-a
-
r
e
f'
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
H
am
a
n
o
Merg
e
branch 'jm/maint-st
r
n
cpy-di
f
f-
n
o-i
n
dex'
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Mer
g
e bundle error
messag
e
fix
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
St
a
rt pr
e
par
i
ng f
o
r
1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Ham
a
n
o
Merge branc
h
'jk/run-co
m
m
and-eacc
e
s' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
aman
o
Merge
b
ran
c
h 'jc/push-upstre
a
m
-sanity
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch 'jc/maint-clean-nes
t
e
d
-worktree-in-sub
d
ir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
M
e
r
ge br
a
n
c
h 'jk/di
f
f
-
no-rename-empty' into
maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch 'rs/combine-diff-zero-cont
e
xt-at-the-beginn
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hama
n
o
Merge b
r
anch 'jc/co
m
mit-unedited-t
e
mpl
a
te' into ma
i
nt
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
m
ano
Merge branch 'jk/a
d
d-p
-
s
kip-confli
c
ts
'
i
nto maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Ham
a
no
M
e
rge bra
n
ch 'jc/com
m
it-hook-authorship' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Merge
branch 'tr/m
a
int-word-diff-rege
x
-sticky' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
ni
o
C
Ha
m
ano
M
e
rge branch 'jh/no
t
es-m
e
rg
e
-
i
n-g
i
t-d
i
r-worktree' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C H
a
man
o
Sync
with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sy
n
c
w
ith 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git
1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
S
ync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
mano
d
i
ff --no
-
index: use strbuf for temporary pathna
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan Nieder
b
u
n
d
le: remove st
r
a
y
single-quote
from error mess
a
ge
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-24
Junio C Ham
a
no
The
fifth batch of topics gradu
a
ted
t
o '
m
aster'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-24
Junio C H
a
ma
n
o
Merge b
r
anch '
f
c/compl
e
tion-tests'
commit
|
commitdiff
|
tree
2012-04-24
J
unio C Hamano
M
erge branch 'cc/fix-missing-va-end-in-
r
eve
r
t'
commit
|
commitdiff
|
tree
2012-04-24
J
u
nio C Ha
m
ano
Mer
g
e branch 'zj/upstream-error-
m
es
s
age'
commit
|
commitdiff
|
tree
2012-04-24
Junio
C
Hamano
Me
r
ge b
r
anch 'mk/g
i
tw
e
b-diff-hl'
commit
|
commitdiff
|
tree
2012-04-24
Jun
i
o C Hamano
Merge bra
n
ch 'it/fetch-pack-
m
any-re
f
s'
commit
|
commitdiff
|
tree
2012-04-24
Junio C Hamano
Merge branch 'pw/f
a
st-impo
r
t-dataref
-
parsing
'
commit
|
commitdiff
|
tree
2012-04-24
J
unio
C
H
a
m
ano
M
e
r
g
e branch '
m
h/ref
-
api'
commit
|
commitdiff
|
tree
2012-04-24
Junio C H
a
m
a
no
Me
r
g
e branch 'hv/sub
m
odule-recurse-push'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
RelNotes:
the
f
our
t
h batc
h
of topics grad
u
ated to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Merge b
r
an
c
h 'b
w
/
t
est-fix-grep-
g
nuism'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Ham
a
no
Merge branch 'rj/sub
m
odule-mswin-path'
commit
|
commitdiff
|
tree
2012-04-23
Jun
i
o
C
Hamano
Merge b
r
anch 'rj/sh-s
e
t
u
p-mswin-
p
w
d'
commit
|
commitdiff
|
tree
2012-04-23
J
unio C Hamano
Mer
g
e
branch 'rj/m
i
ngw-isg
u
i
d
'
commit
|
commitdiff
|
tree
2012-04-23
Ju
n
io C Hamano
Merge branc
h
'
j
n
/fast
-
import-d
o
c'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Ham
a
no
M
e
r
g
e bra
n
c
h 'jn/more-i1
8
ncmp'
commit
|
commitdiff
|
tree
2012-04-23
J
unio C Hamano
Merge bra
n
ch 'jl
/
maint-submodule-recurse-fet
c
h
'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Merge branch 'jc/maint-b
l
ame-
m
inimal'
commit
|
commitdiff
|
tree
2012-04-23
Junio C H
a
mano
Merge branch
'
lp/main
t
-
diff-three-dash-wit
h
-
g
rap
h
'
commit
|
commitdiff
|
tree
2012-04-23
J
unio C H
a
mano
Merge branch 'rs/commit-
l
i
st-
s
o
r
t-
i
n-batc
h
'
By René Scharfe (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-23
J
unio C Hamano
Me
r
g
e
branch '
j
h/app
l
y-free-patch'
By
Junio C Hamano
(8) and Jared Hance (1)
commit
|
commitdiff
|
tree
2012-04-23
Junio C Ha
m
ano
Merge bran
c
h
'
s
l/tes
t
-wc-l-
l
ine-count'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
M
e
rge
branch '
j
n/debian-customize
s
-d
e
fault
-
e
d
itor'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Merg
e
branch
'
rl/
s
how
-
e
mpty-pr
e
fix'
commit
|
commitdiff
|
tree
2012-04-23
Juni
o
C
Hamano
Merge branch 'pw/
g
it-p4
'
commit
|
commitdiff
|
tree
2012-04-23
Jun
i
o C
H
a
ma
n
o
Merge branch '
m
s
/
remote-usage-stri
n
g
'
commit
|
commitdiff
|
tree
2012-04-23
J
u
nio C Hamano
Merge branc
h
'
j
k
/
rebase-i-submodule-conflict-only'
commit
|
commitdiff
|
tree
2012-04-22
SZEDER Gábor
compl
e
tion:
fix comple
t
ion aft
e
r 'git --opt
i
on <
T
AB>'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-22
Jonathan Nieder
completion: avoid trailin
g
space
for --exec-path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-22
Fe
l
ipe Contreras
c
omp
l
etion:
a
dd miss
i
ng general optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-22
Felipe Co
n
treras
co
m
pletion: simplify by us
i
ng $prev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-22
F
elipe Con
t
r
eras
com
p
letion: simplify __
g
itc
o
mp_1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-22
SZEDER
Gábo
r
tests: add tes
t
s for
t
h
e
__gitcomp()
c
ompleti
o
n
helper
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-22
C
hr
i
stian Co
u
d
er
revert:
add miss
i
ng v
a
_end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-20
Junio
C Haman
o
RelNotes:
the
thi
r
d ba
t
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-20
Jun
i
o C
H
am
a
n
o
Merge bran
c
h 'js/spawn-
v
ia-shell-pat
h
-fix'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Ha
m
an
o
Merge branch 'ct/ad
v
ise-push
-
def
a
ult'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Merge
b
ranch 'bw/submo
d
ule-sed-so
l
aris
'
commit
|
commitdiff
|
tree
2012-04-20
Junio C
H
a
m
ano
Me
r
ge
b
ranch
'
jk/run-command-ea
c
ces'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Merge branch '
j
c/push-
u
pstream-s
a
nity'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Merg
e
bran
c
h 'jc/am-report-3wa
y
'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Ha
m
ano
M
erge bra
n
ch 'jb/am-include'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Haman
o
Merge branch '
j
c
/f
m
t-merge-msg-people'
commit
|
commitdiff
|
tree
2012-04-20
Johannes Sixt
t
9
30
0
-fast-import: avoid
'
e
xit' in test
_
expect_success
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Ralf
T
h
ie
l
o
w
sequence
r
:
r
emo
v
e
a
d
dition
a
l blank line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Junio C Ha
m
ano
t9400:
fix gn
u
ism in gr
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Junio C Hamano
fmt-merge-msg: discard needl
e
ss merge pa
r
e
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ramsay J
o
n
es
g
it-sh-setup
.
sh: Add an pw
d
() functio
n
for MinGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ramsay Jon
e
s
git-submodu
l
e
.
sh: Don't use $
p
ath v
a
r
i
able i
n
e
val_get
t
ext
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
R
am
s
a
y Jones
compat/mingw
.
h: Set S_IS
U
ID to prevent a fast-import
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ju
n
i
o
C H
a
m
an
o
builtin/m
e
rge
.
c: reduce paren
t
s earl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ju
n
io C
Haman
o
builtin/merge
.
c
:
collect other parents early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hama
n
o
built
i
n
/merge
.
c: r
e
mov
e
"remoteheads"
global variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Michał Kiedrowicz
merge tests: octo
p
us with
r
edundant parents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Junio C Ham
a
no
mer
g
e
s
ort: rename it
to llist_mergeso
r
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Johann
e
s
S
ixt
Do not use SHELL_PATH from bu
i
l
d system
i
n prepare_shell_cmd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Marc Bra
n
cha
u
d
f
etch: describe new refs ba
s
ed on
where it
came from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Mar
c
Branchaud
fetch: Give r
e
mote_ref
t
o update_
l
ocal_ref() as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Ju
n
io C Hamano
Rel
N
o
t
es: the sec
o
n
d
batc
h
of topic
s
g
r
a
duated to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Ju
n
io C Hamano
Merge branch 'jk/add-p
-
skip-conflic
t
s'
commit
|
commitdiff
|
tree
2012-04-16
Junio C H
a
mano
M
e
rge br
a
n
ch 'jc/commit-
u
ned
i
ted-templ
a
te'
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge br
a
nch
'bw/spawn-via-shel
l
-p
a
th'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Ham
a
no
M
erge
branc
h
'wk/g
i
tweb-snap
s
hot-use-if-
m
odified
-
since'
commit
|
commitdiff
|
tree
2012-04-16
Junio
C
Hamano
Merge b
r
an
c
h 'jk/http-ba
c
kend-keep-co
m
mitter-ident
.
.
.
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge
branch 'sl/autoconf'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merg
e
branch 'jk/branch-quiet'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Mer
g
e branc
h
'rs/combine-diff-zero-c
o
ntext-at-
t
he-beginn
i
ng'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Haman
o
Merge branch 'jk/d
i
ff-no
-
r
e
name-em
p
ty'
commit
|
commitdiff
|
tree
next