repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
push: avoid suggesting "merging" remote changes
2013-07-07
J
o
h
n
K
e
eping
push: avoi
d
sugg
e
sting "merging" remot
e
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-24
Ju
n
i
o C Hamano
Git 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
F
e
lipe
C
ontr
e
ras
remote-hg: fix order of configuration comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Contrera
s
remote-hg: trivial configuration note cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-21
Fe
l
i
p
e
Contreras
completi
o
n: r
e
gression fix for zsh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-20
Ju
n
i
o C Hamano
Merge
g
it
:
//git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2013-05-20
Amit Bakshi
remote-hg:
set stdout to binar
y
mode on
w
in32
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio
C Hama
n
o
Git 1
.
8
.
3
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Junio
C
Ha
m
a
n
o
M
e
rge b
r
anch 'fc/doc-s
t
yle'
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Merge branch
'
d
w/asci
i
doc-sources-are-dot
-
t
xt-files'
commit
|
commitdiff
|
tree
2013-05-17
Felipe Contreras
document
a
tion: trivial style
cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Juni
o
C
Hamano
Mer
g
e gi
t
://ozlabs
.
org/~p
a
ulus/git
k
commit
|
commitdiff
|
tree
2013-05-17
Joh
n
Keepi
n
g
difft
o
ol
:
fix
d
ir-diff when file
d
o
e
s
not exi
s
t
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Felipe Contreras
remote-bzr: fixes for older
v
ersions of
b
zr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-17
Sandor
Bodo
-
Merle
rem
o
t
e-bzr: fix old
o
r
g
anization
destroy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felip
e
Contre
r
as
Revert "remote-h
g
: update bookmarks when pulling"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
D
a
le R
.
Worley
git-
s
ubmo
d
ule
.
txt:
Clarify '
i
nit' an
d
'
a
dd' sub
c
om
m
ands
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-16
Felipe
C
o
nt
r
eras
r
emote-b
z
r:
f
ix
cloning of non
-
listable
repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Junio C Hamano
M
erge branch 'fc
/
re
m
ote-
h
g'
(
early pa
r
t)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contrera
s
remote-hg:
update bookmar
k
s
w
hen pul
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe
Contrer
a
s
remote-hg
:
don't push fake 'maste
r
' bo
o
kmark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
remote-hg: dis
a
ble
forced
p
u
sh by def
a
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Feli
p
e
Contrer
a
s
re
m
ote-hg: fix ne
w
bra
n
ch creation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
e
lipe Contreras
rem
o
te-h
g
: add new get_con
f
ig_bool() helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
F
e
lipe Contreras
remote-h
g
: e
n
abl
e
track-branch
e
s i
n
hg-git mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
remote-hg
:
get ri
d
of unus
e
d excepti
o
n chec
k
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-15
Feli
p
e Cont
r
er
a
s
re
m
ote-hg: trivi
a
l cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-14
Felipe Contreras
remote-bzr:
update
o
ld organiz
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
J
u
nio C H
a
mano
Gi
t
1
.
8
.
3-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-13
Juni
o
C Hamano
Merge
git://ozlabs
.
org/~paulus/gitk
commit
|
commitdiff
|
tree
2013-05-11
Torsten Bögershausen
test-b
z
r: do not use unportabl
e
s
ed '\
+
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-11
Junio C
Ha
m
ano
Merge
git:/
/
g
i
t
.
bogomips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2013-05-10
Dale Wo
r
ley
CodingGuidelines: Documentation/*
.
txt a
r
e the sources
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C Haman
o
Syn
c
with v1
.
8
.
2
.
3
commit
|
commitdiff
|
tree
2013-05-09
J
unio C Hamano
Git 1
.
8
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio
C
Hamano
Merge branch 'mv/se
q
ue
n
cer-pick-error-diag'
commit
|
commitdiff
|
tree
2013-05-09
J
unio C Haman
o
c
h
e
rry-p
i
ck:
p
icking a
t
ag t
h
a
t re
s
olves to a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
Merge branc
h
'tr/copy-rev
i
s
i
o
ns-from-stdin' into maint
commit
|
commitdiff
|
tree
2013-05-09
René Scharfe
t5004: avoid using tar for che
c
king emptine
s
s of
archive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
R
ené
S
c
h
arfe
t50
0
4
: ign
o
re p
a
x global h
e
a
d
er
f
il
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
David Aguilar
mergetools/kdiff3:
do not use --au
t
o
when diffing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-09
Felipe
Contreras
trans
p
ort-hel
p
er: triv
i
al
s
tyle cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio C
H
amano
Up
d
ate draft re
l
e
ase notes
f
o
r
1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contreras
re
m
o
te-helpers:
t
rivial cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contreras
remote-bzr
:
f
i
x
f
o
r disapp
e
ared revisi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Hamano
Merge
g
it://github
.
co
m
/git-l
1
0
n/gi
t
-
p
o
commit
|
commitdiff
|
tree
2013-05-07
Junio C Ham
a
no
Merge branch 'jk/me
r
ge-tre
e
-
add
e
d-identica
l
l
y'
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree:
handle
directory/
e
mpty conflict correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-07
J
u
nio C
H
ama
n
o
Merge branch '
f
c
/
rem
o
te-
b
zr'
commit
|
commitdiff
|
tree
2013-05-07
Felipe
Contreras
re
m
ote-b
z
r
: avoid bad refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-06
Feli
p
e
Contreras
re
m
ote-b
z
r: conve
r
t
a
ll unicode
ke
y
s to str
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-05
Jun
i
o
C H
a
mano
Merge
branch 'fc/
p
u
s
h
-with-export
-
reportin
g
-res
u
lt'
commit
|
commitdiff
|
tree
2013-05-05
Felip
e
C
o
n
t
r
e
ra
s
transport-h
e
lper: imp
r
ove
push m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
J
u
nio
C
H
aman
o
G
i
t 1
.
8
.
3-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-03
Junio C Hamano
Merge branch 'tr/unp
a
ck-entry
-
use-a
f
ter-free-fix'
commit
|
commitdiff
|
tree
2013-05-03
Junio C Ha
m
ano
Sync
w
ith mai
n
t
commit
|
commitdiff
|
tree
2013-05-03
J
u
nio
C
Hamano
M
e
rge branc
h
'
tr/
r
em
o
te-tighten-commandline-parsin
g
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Junio C
H
am
a
no
Merge branch
'
jn/glo
s
sary-
r
evi
s
ion' into maint
commit
|
commitdiff
|
tree
2013-05-03
Felipe Cont
r
eras
compl
e
tion:
zsh: don'
t
over
r
ide
s
uffix on _d
e
tault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-02
Anders Gr
a
ns
k
ogen
.
.
.
Documentatio
n
/git-commit
:
T
ypo under --edit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Ham
a
no
U
p
d
a
te draft
r
elea
s
e
n
o
te
s
to 1
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Ma
r
c Bra
n
chaud
Fix grammar i
n
the 1
.
8
.
3 rel
e
ase note
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Junio C
Hamano
Me
r
ge branch 'hb
/
g
i
t
-
pm-tempfile'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Merge
branch 'rs/pp-u
s
er-info-witho
u
t-extra-
a
lloc
a
tion'
commit
|
commitdiff
|
tree
2013-05-01
Junio C
H
a
m
a
no
Mer
g
e branch 'tr/remote-tighten-commandline-parsi
n
g'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hama
n
o
M
erge
b
ranch 'z
k
/
prompt-reb
a
se-s
t
ep'
commit
|
commitdiff
|
tree
2013-05-01
F
elipe Cont
r
era
s
re
m
ote-bzr:
acce
s
s branche
s
only w
h
en needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
i
pe C
o
ntreras
r
e
mote-bzr: delay
p
eer br
a
nch
u
sage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
elip
e
C
o
ntr
e
ras
r
emot
e
-
bzr
:
iter
a
te revisi
o
ns
properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
re
m
ote-bzr: impr
o
ve progr
e
s
s report
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
ntrera
s
rem
o
t
e
-bzr: a
d
d
o
ption to
s
p
e
cify branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
ipe Contreras
remote-b
z
r: add custom method
t
o find branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e Contreras
remote-bzr: im
p
rove
a
uthor s
a
n
itazi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
e
m
o
te-bzr:
add
s
uppor
t
fo
r
shared
repo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
remote-bzr
:
f
ix branc
h
na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
ontreras
remote
-
bzr: a
d
d
s
u
p
p
ort fo
r
bzr repos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lipe Contreras
r
emot
e
-bzr: use bran
c
h var
i
a
ble when appr
o
priate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: f
i
x
p
artiall
y
pushed merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bz
r
: fixes
fo
r
branch diverge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
remote-bzr
:
a
dd support to
push merg
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Contrera
s
remote-bzr: always
tr
y
to u
p
date the worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote-bzr: fix or
d
er o
f
l
ocking in Custo
m
T
r
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
reras
remote-bzr:
d
ela
y
blob
f
e
t
ching u
n
til the very end
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Con
t
r
e
ras
re
m
ote-bz
r
: cleanup CustomTree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-30
T
homas Ra
s
t
u
n
pack_entry: avoid f
r
eei
n
g o
b
j
e
cts
i
n
b
a
s
e cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
R
a
mk
u
m
ar Rama
c
handra
git-comp
l
etion
.
b
ash: add
r
emote
.
push
d
efau
l
t to config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar
Ramachandra
g
i
t
-
com
p
let
i
on
.
bash: ad
d
branch
.
*
.
pushr
e
mote to
config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ju
n
io C Hamano
M
e
rge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2013-04-29
Ju
n
io C Hamano
Merge bra
n
ch 'fc
/
zsh-comp
l
e
tio
n
' into maint
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contreras
complete: zsh: use zsh co
m
pletion for the main cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Felipe Contreras
complete
:
zsh: triv
i
al
s
implifica
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar Ramachand
r
a
git-completion
.
bash
:
comp
l
ete branch
.
*
.
r
e
base
a
s boolean
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
R
a
m
k
umar Ramachandra
g
i
t-comp
l
etion
.
bash:
a
dd diff
.
su
b
modul
e
t
o config list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
R
amkumar Ramach
a
nd
r
a
git
-
comp
l
e
t
ion
.
bash: lexical sorting
f
or
d
iff
.
statGraph
W
id
t
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merijn Brand
Git
.
pm: call
t
e
m
pfile
f
rom File::Temp as a regular
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2013-04-28
F
e
lipe Con
t
r
e
ras
d
ocume
n
tation:
t
rivial w
h
itespace cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
John Keep
i
ng
t/Ma
k
efile: remo
v
e s
m
oke test target
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-28
J
u
nio C Hamano
Merge branch 'nd/prett
y
-
for
m
ats'
commit
|
commitdiff
|
tree
2013-04-28
Ramsay Jones
p
r
et
t
y: Fix bug i
n
t
r
u
n
c
ation support for %>, %< and %><
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next