repo.or.cz
/
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 'jc/merge-reduce-parents-early' into maint
2012-05-03
Ju
n
io C Hamano
Merge branch 'jc/merge-reduce-parents-early' into
maint
By
Junio C Hamano
(4) and Michał Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Me
r
ge branch
'
cb/che
r
ry-pick-re
v
-path-confusion' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
M
erge branch
'
cb/h
t
t
p
-mult
i
-
curl
-
aut
h
' in
t
o
maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
M
erge b
r
anch
'mb
/
fetch-call-a-non-branch-a-ref' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ham
a
no
M
e
r
g
e
branch
'
rl
/
maint-stash-i
1
8n-save-er
r
or' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ha
m
ano
Merge branch
'
jm/maint-st
r
n
c
p
y
-di
f
f-no-
i
n
dex' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-02
J
unio C Hama
n
o
G
i
t
1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge br
a
nch 'pw/fa
s
t-im
p
ort
-
d
atar
e
f-parsing
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Hamano
Merge
b
ranch 'it/fetch-
p
ack-
m
an
y
-r
e
fs' int
o
m
ai
n
t
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C
H
amano
M
erge branch 'jl/maint-submodule-recurse-f
e
tch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'
jc
/
m
a
int-b
l
ame-minimal
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-05-02
J
u
ni
o
C
H
ama
n
o
Merg
e
b
ra
n
ch '
l
p
/
m
aint-diff
-
three-
d
ash-w
i
th-graph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'jk/reba
s
e-i-submodul
e
-co
n
flict-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
i
o
C
Hamano
M
er
g
e
b
r
anc
h
'
m
aint'
o
f https://github
.
com
/
git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Start preparing
f
or 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Mer
g
e
branch 'jk/run-
c
ommand-eacces' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
M
e
rge branch
'jc/push-upstream-sanity' into maint
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
i
o
C Hamano
Merge branch 'jc/maint-clean
-
ne
s
ted-
w
orktr
e
e-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C
Hamano
Merge branch 'j
k
/diff
-
no-rename-empty' into ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
M
erge
b
ranch 'rs/combine-dif
f
-zero-context-a
t
-the-beginning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge bran
c
h 'jc/commit-unedited-templa
t
e
'
int
o
ma
i
nt
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
r
g
e
branch 'jk/add-
p
-skip-co
n
fli
c
ts' int
o
maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Me
r
ge
branch 'j
c
/
commit-
h
ook-au
t
horship' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Mer
g
e b
r
anch 'tr/maint-wo
r
d
-diff
-
r
e
ge
x
-sticky
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Mer
g
e branch 'jh/
n
otes
-
mer
g
e-in-
g
it-di
r
-
w
orktree' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Sy
n
c with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
G
i
t
1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
i
o C
Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hamano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
G
i
t
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C
Hamano
d
i
ff --no-index:
u
se s
t
rbuf
for temporary pathnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonat
h
an Nieder
bundle: re
m
ove
s
t
ray single-quote fr
o
m error message
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
J
unio
C
H
amano
f
m
t
-
me
r
ge-msg: discard needless merge parents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio
C
Hama
n
o
builtin/me
r
ge
.
c:
r
educe parents early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hamano
builtin/merge
.
c: c
o
llect o
t
her
p
are
n
ts ea
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Jun
i
o C
Haman
o
builtin/merge
.
c: r
e
mo
v
e "remoteh
e
ads" g
l
obal va
r
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Michał Kiedrow
i
c
z
merge tests:
o
cto
p
us wit
h
redunda
n
t pa
r
e
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Mar
c
Bran
c
haud
fetc
h
: desc
r
ibe ne
w
refs based o
n
where it came from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
M
a
r
c Branchaud
f
e
tch: Give remote_ref to
update_local_ref
(
)
a
s
w
e
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Jim Meyerin
g
diff:
avoid stack-bu
f
fer-
r
ead-overrun for
ver
y
long
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Clemens Buchacher
cherry-pick:
do not
expect fi
l
e a
r
guments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Ro
s
s
Lagerwa
l
l
stash: u
s
e
eval_get
t
extln correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jens
L
ehma
n
n
sub
m
o
d
ul
e
s
:
recursive
f
etch also checks new tags for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jeff King
http: use newer
curl opti
o
ns f
o
r setting
c
redentials
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Je
f
f King
http: clean up leak in init_
c
u
rl_http_auth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Ju
n
io
C Ha
m
ano
bla
m
e: acc
e
p
t
--need-mi
n
imal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Ivan
Todoros
k
i
remote-cur
l
: m
a
in test
case for the O
S
command line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Ivan Tod
o
roski
fe
t
ch-pack: tes
t
cases f
o
r
t
he new -
-
stdin option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Iv
a
n Todoroski
remot
e
-curl: send
the refs to fetch-pac
k
on stdin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Pete Wyckoff
f
a
st-import: tighten parsing o
f
datarefs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Junio
C
H
a
mano
Merge branch 'maint
-
1
.
7
.
9' into maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Haman
o
M
e
r
g
e b
r
anc
h
'
ma
i
nt-1
.
7
.
8' int
o
maint
-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
Ren
é
Sch
a
rfe
tes
t
-
s
ubp
r
oces
s
: f
i
x
segfault
without argumen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
sub
m
odule: fix
p
roto
t
ype of g
i
tmodules_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Jeff King
fix http
auth wit
h
multiple curl handles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Clemens Buchacher
http auth fai
l
s with mul
t
i
p
le curl handles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i c
o
ntinue: don't skip commits
t
hat only change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
ge bra
n
ch 'jc/
m
aint
-
verify-obj
e
cts-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Ha
m
ano
Merge branch 'dw/
g
itwe
b
-doc-grammo'
i
nt
o
maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr/c
a
che-tr
e
e' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Ham
a
no
Merge branch 'cb/maint-t5541-ma
k
e-s
e
rver-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hama
n
o
Merge branch
'
cn/maint-rev-li
s
t-doc' into
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
H
aman
o
Merge br
a
nch 'tr/
m
ai
n
t-bund
l
e
-
boundary' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Hamano
Merge branch
'
tr/maint-
b
undle-long-subject' in
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'ph/rerer
e
-doc' int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio C Hamano
Gi
t
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Fe
l
ipe
C
ontrer
a
s
s
p
e
c
:
add miss
i
ng bu
i
l
d dependen
c
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
J
eff King
ru
n
-command
:
tre
a
t inaccessible direc
t
o
ries
as E
N
OENT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Ramsay Jo
n
es
compat/ming
w
.
[ch
]
: Change return type
o
f exec functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Junio C Ham
a
no
push: error ou
t
when
the "upstre
a
m"
s
ema
n
tics d
o
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Jeff King
add--intera
c
tive
:
ignore u
n
me
r
ged entr
i
es in patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Junio C Hamano
Documentation/git
-
commit:
re
p
h
rase the "initia
l
-ne
s
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Juni
o
C
H
ama
n
o
Git 1
.
7
.
10-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C
H
a
mano
Merge
b
r
a
nch
'
p
t
/
gitk'
commit
|
commitdiff
|
tree
2012-04-02
Ivan T
o
d
o
roski
fet
c
h-pack: new --stdi
n
o
ption to re
a
d
r
e
fs from
s
td
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio
C
Ha
m
an
o
Sync with 1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C Hama
n
o
Merge branch 'jc/
m
ai
n
t-merge-autoedit' into
m
aint
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gi
t
k:
f
ix
s
e
ttin
g
font
d
isplay with new ta
b
bed d
i
alog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
P
a
t
Thoyts
gi
t
k: fix tab
b
ed pre
f
erence
s
constr
u
ction when using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C Ha
m
ano
Merge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-04-01
Ada
m
Monsen
git-c
o
mmit
.
txt: clarify
-
t requir
e
s
editing message
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-31
J
u
nio C Hamano
M
e
rge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2012-03-30
Junio C Hamano
com
m
it: reph
r
ase the error when
u
ser did not
touch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Hamano
commit: do not trig
g
er bogus "h
a
s
te
m
p
l
a
t
ed message
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
J
u
n
i
o C H
a
mano
t750
1
:
test the right
kind of b
r
eaka
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voig
t
s
t
ring-list: d
o
cument th
a
t
string_li
s
t_
i
nser
t
(
)
inserts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
René
Scharf
e
c
o
n
fig: re
m
ove useless assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Junio C Hamano
Git 1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Mey
e
rin
g
correct
a few doubl
e
d
-word
n
i
ts in c
o
mments
a
nd documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Me
y
eri
n
g
c
orrect spel
l
ing: an URL -> a
U
RL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Junio
C
H
amano
l10n updates for Git 1
.
7
.
10-
r
c1
commit
|
commitdiff
|
tree
2012-03-27
Zbigniew Jędrzejewsk
.
.
.
tests: unset COL
U
M
N
S inhe
r
i
t
ed from en
v
ironment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Update draft re
l
ease notes
to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
amano
Sync
with 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o
C Ham
a
no
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge branch 'jn/ma
i
nt
-
fast-import-
e
m
p
t
y-ls'
into main
t
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Merge bran
c
h 'ph/rer
e
re-doc' into maint
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Merge branch 'ms/mai
n
t-config-err
o
r-at-e
o
l-linecount
.
.
.
commit
|
commitdiff
|
tree
next