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 'nl/rebase-i-cheat-sheet' into maint
2012-05-10
Junio C Hamano
Merg
e
branch 'nl/reba
s
e-i-cheat-sheet'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-10
J
u
n
io C Hamano
M
e
rg
e
bran
c
h 'bw/submodule-
s
ed-
s
ol
a
ris
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
Merge
branch 'jk
/
maint-push
-
progress
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-05-10
J
uni
o
C Ha
m
a
n
o
Merge b
r
anch '
j
c
/
rerere-train' i
n
to
maint
commit
|
commitdiff
|
tree
2012-05-10
Junio C Hamano
M
e
r
ge branch 'l
p
/diffstat-
w
it
h
-gra
p
h' into m
a
int
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Start preparing for 1
.
7
.
10
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch '
j
k/maint-g
i
t
w
eb-test-
u
se-sane-perl
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
u
ni
o
C Hamano
Merge branch 'js/dae
m
on-test-
r
ace-fix' into
maint
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C Ha
m
ano
M
e
rge branc
h
'jk/maint-con
f
ig
-
bogus-
s
ecti
o
n' into maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
Me
r
ge branch 'pw/t5800-import-race-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o C Haman
o
Merge b
r
a
n
c
h
'rt
/
cherr
y
-revert-conflict-summary' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
J
u
n
io C
H
amano
M
e
rge br
a
n
ch 'cb
/
maint-re
p
o
r
t-mount-point-cor
r
ectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
P
ete
W
yckoff
git p4 do
c
: fi
x
formatting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ham
a
no
M
e
r
ge branch 'jc/merge-reduce
-
parents-early'
i
n
to mai
n
t
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
i
o
C Hamano
Merge branch 'cb/che
r
ry-pi
c
k-rev-path-
c
o
n
fusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Juni
o
C H
a
mano
Merge
branch 'c
b
/h
t
tp
-
multi-curl
-
a
u
th' in
t
o maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Merge branch 'mb/fetch-call-a-non-branch
-
a
-
ref' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C Ha
m
ano
Merge branch 'rl/maint-stash-i18n
-
save-error' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
Merge branc
h
'jm/maint-
s
tr
n
cpy-
d
iff-no-i
n
dex' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Git 1
.
7
.
1
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Me
r
ge branch 'p
w
/fa
s
t-import-dataref-parsing
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
i
o C Hamano
Me
r
ge bran
c
h 'it/fetch-pa
c
k-many-refs'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merg
e
branch
'
j
l
/maint-submodu
l
e-rec
u
r
se-fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
man
o
M
erge
br
a
nch 'jc/
m
aint-blame-mini
m
a
l' into maint
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Hamano
Merge b
r
anch 'lp/maint-diff-three-dash-with-
g
raph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jk/rebase-i-submo
d
ule-conflict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Mer
g
e b
r
anch
'maint' of
h
t
tps://g
i
th
u
b
.
co
m
/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbig
n
iew Jędrzejew
s
k
.
.
.
Consi
s
tentl
y
use perl
from /u
s
r/bin
/
fo
r
scripts
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
eff King
t/
g
itweb-lib: use $PERL_PA
T
H to run git
w
e
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
Jeff
K
ing
t5541: test
m
ore c
o
mbinat
i
ons of --progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
eff King
tea
c
h
send-pack abou
t
-
-
[
no-]progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-01
J
e
ff Kin
g
send-pack: sho
w
pr
o
gres
s
when
isatty(2)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C
H
am
a
no
cont
r
ib/re
r
e
re-t
r
a
in
:
use ins
t
alled git-
s
h-setup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Zbigniew
Ję
d
rzejews
k
.
.
.
t405
2
:
work around
s
hells u
n
a
b
le to set COLU
M
NS to 1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Junio C Hamano
Me
r
ge branch 'zj
/
mksh
-
columns-breakage' into lp/diffsta
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-27
Zb
i
gniew
Jędrzejewsk
.
.
.
test-lib: skip te
s
t wi
t
h COLUMNS=1 und
e
r mksh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-27
Johannes Sixt
t5570:
f
i
x f
o
rw
a
rding of gi
t
-daem
o
n mess
a
ge
s
via cat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
man
o
Start prep
a
ring for 1
.
7
.
1
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hama
n
o
Me
r
ge branch 'j
k
/run
-
co
m
ma
n
d
-eacces' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
Merg
e
bra
n
c
h
'jc/push-upstream-sanity' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Me
r
ge branch 'jc/maint-clean-nested-wo
r
ktree-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch 'jk/diff-no
-
rename-empty
'
into main
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch
'
r
s/combine-diff
-
zero-con
t
ext-a
t
-the-beginning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Merge b
r
anch 'jc/commit-unedit
e
d-template'
i
nto mai
n
t
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C Ha
m
ano
Merge br
a
nch 'jk/add-
p
-
skip-conflicts' into m
a
int
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch
'
jc/
c
ommi
t
-hoo
k
-
auth
o
rship' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
i
o C Hamano
Merge br
a
nch 'tr
/
maint-word-diff-regex-st
i
cky' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Merge b
r
anch 'jh/notes-mer
g
e-in-git
-
dir-w
o
r
k
tr
e
e' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Sync wi
t
h 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Git
1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C
H
aman
o
Sync
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
Ham
a
no
Git
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
diff --no
-
index: us
e
strbuf for tem
p
ora
r
y pathnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan Nieder
b
u
ndle: remove stray sin
g
le-qu
o
te from error message
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
ef
f
Ki
n
g
con
f
ig: reject bogus
s
ection names for --ren
a
m
e
-
sec
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-24
Pete Wyc
k
off
git-re
m
ote-testgit: fix race when spawning fast-
i
mport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Ralf T
h
ielow
sequencer
:
remove
addit
i
onal bla
n
k
lin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Junio C Hamano
fmt-merge-msg: discard
n
eedless merge parents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Lu
c
i
an P
o
ston
P
revent graph_width of stat width
from
f
allin
g
below min
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Lucia
n
Po
s
ton
t4052: Test diff-
s
tat output
with minimum columns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
J
u
nio C Hamano
buil
t
in/
m
e
rge
.
c
:
r
educe parents
e
a
rly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hamano
bu
i
l
t
i
n/merg
e
.
c: collect other parents ear
l
y
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: re
m
o
v
e "remoteheads"
g
lobal
varia
b
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Michał Kiedrowicz
merge te
s
t
s: octopus
w
ith redundant parents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Marc Branchaud
fetch: describe new refs base
d
o
n
where it ca
m
e from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Marc Brancha
u
d
fetch: Give rem
o
te_ref
to update_local_ref()
a
s well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
L
u
cian Poston
t40
5
2: Adj
u
st --gr
a
ph
-
-
s
t
at
o
utput for prefix
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Lucian
Poston
Adju
s
t stat width calculati
o
ns to t
a
ke -
-
graph output
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Lucian P
o
ston
Add output_prefix_leng
t
h
to d
i
f
f
_
options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Z
bigniew
Jędrzeje
w
sk
.
.
.
t
4
052
:
test
--stat output with --graph
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Jim Meyering
diff:
a
void stac
k
-bu
f
fer-
r
ead-overrun for ver
y
l
ong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Clem
e
ns B
u
c
h
ache
r
cherry-pick: do not exp
e
ct file arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Clemens Buchac
h
e
r
properly
k
eep
t
r
ack of current work
i
ng directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Ross
L
ager
w
a
ll
s
t
ash: us
e
eval_gettex
t
ln correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jens Lehmann
submod
u
les: recursive fetch al
s
o chec
k
s new t
a
g
s f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jeff King
h
t
tp
:
us
e
n
e
w
er curl options for setting credentials
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jef
f
King
http: clean u
p
le
a
k i
n
init
_
c
url_http_auth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Hamano
blame: accep
t
-
-
n
e
e
d-
m
inim
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
I
v
an Tod
o
r
o
s
k
i
remo
t
e
-curl: main test cas
e
for the OS command
l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
I
v
an T
o
do
r
oski
fetch-pack: test ca
s
es
for the new --stdin
op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Ivan Todo
r
oski
remote-curl: send
the re
f
s to f
e
tch-pack o
n
s
tdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Pete
Wyc
k
off
fast-import: tighten parsing of d
a
t
a
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
M
e
rg
e
branch
'
ma
i
nt-1
.
7
.
9' into
ma
i
n
t
commit
|
commitdiff
|
tree
2012-04-10
Juni
o
C Hamano
Merge branch 'm
a
int-
1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Scha
r
f
e
t
e
st-s
u
bprocess:
fix
s
e
gfault without arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
submodule: fix p
r
o
t
otype of gi
t
modules
_
config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
J
e
ff
King
fix
http auth wit
h
m
u
l
tiple curl
h
andles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
C
lem
e
ns Buchac
h
er
h
ttp auth
fails with multiple curl handles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
John
Kee
p
ing
rebas
e
-
i
con
t
inue: don't sk
i
p commits
that only c
h
a
n
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Ben
W
a
lton
A
v
oid bu
g
i
n Solaris x
p
g4/sed as
used
in s
u
b
m
odule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
J
unio
C Hamano
M
erge branch '
j
c/main
t
-
verif
y
-obje
c
ts-remo
v
e-
p
essi
m
ism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
n
i
o
C
H
amano
M
e
rge bra
n
ch 'dw/g
i
tweb-d
o
c-grammo' into mai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge
b
ranch 'tr/cach
e
-tree' i
n
to maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio C
H
amano
Merge b
r
a
nch 'cb/
m
ai
n
t-t55
4
1-make-server-port-po
r
table
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
M
erge b
r
an
c
h 'cn
/
maint-rev-
l
ist-doc' i
n
to
m
aint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
Merge branch 't
r
/m
a
i
n
t-bu
n
dle-boun
d
ary' i
n
to
m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Haman
o
Merge bran
c
h 't
r
/maint-bundle-long-subject' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge
b
ranch 'ph/r
e
rere
-
doc
'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
next