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
mergetool--lib: refactor {diff,merge}_cmd logic
2013-06-17
Jo
h
n Keepin
g
mergetool--lib: refa
c
tor {dif
f
,mer
g
e}_cmd logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-24
Junio C Ham
a
no
G
i
t 1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-21
Felipe C
o
ntreras
r
e
m
ote-hg: fi
x
o
rder of con
f
i
gura
t
ion comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-21
F
eli
p
e Co
n
treras
rem
o
te
-
hg:
t
rivial configura
t
ion n
o
t
e c
l
e
anup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-21
Felipe Contrera
s
completion: regre
s
sion fix for zsh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-20
Junio C Ha
m
ano
Merge
git://g
i
t
.
b
ogomip
s
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2013-05-20
Amit B
a
ksh
i
remote-hg: set stdout to binary mo
d
e
on win32
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Ju
n
io C Ha
m
an
o
Git 1
.
8
.
3
-
r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Junio C Hamano
Merge branch 'f
c
/
doc-style'
commit
|
commitdiff
|
tree
2013-05-17
Junio C
H
aman
o
Merg
e
b
ranch 'dw/asciido
c
-
s
o
urc
e
s-are-dot-t
x
t-fi
l
e
s'
commit
|
commitdiff
|
tree
2013-05-17
Felip
e
Contreras
documenta
t
ion: trivial style clea
n
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Juni
o
C Hamano
Merge git://ozlabs
.
org/~paulus/git
k
commit
|
commitdiff
|
tree
2013-05-17
J
ohn K
e
ep
i
ng
difftool:
fix dir
-
diff when file does
not ex
i
s
t in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
F
elipe Contreras
remo
t
e
-bz
r
: fixes for older
v
e
r
sio
n
s of bzr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-17
Sand
o
r Bodo-Me
r
le
remote-b
z
r:
fix old or
g
a
n
iza
t
ion
destroy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-16
Felipe Contreras
R
e
v
ert
"remote-hg: update bo
o
kmark
s
when p
u
ll
i
n
g
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-16
D
a
le R
.
Worley
g
it-submodule
.
txt:
C
larify 'init' and
'
add' sub
c
o
m
m
a
n
ds
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-16
Fe
l
ipe
Contrer
a
s
remote-bz
r
:
fix
cloning of n
o
n-listab
l
e repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Junio C
H
amano
Merge branch 'fc/remote-hg' (earl
y
part)
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contre
r
as
remote-h
g
:
u
pdate
b
o
o
k
m
ar
k
s
when pulling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Co
n
treras
remot
e
-hg: don't
p
ush
fake
'ma
s
ter
'
bookmark
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contreras
remote-hg: disable
forc
e
d push by
d
efa
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Fel
i
pe Contreras
remote-
h
g: fix new b
r
anch
c
r
e
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Felipe Contrera
s
remote-hg: add
n
e
w
get_c
o
n
f
ig_bool()
hel
p
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
F
e
lipe Co
n
treras
remote-
h
g: ena
b
le tr
a
ck-branches in
hg-
g
i
t mod
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
Feli
p
e Contr
e
ras
remote-hg: get rid of un
u
se
d
exception checks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-15
F
elipe
C
on
t
reras
remote-h
g
:
tr
i
vial cleanups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-14
Felipe
C
on
t
rera
s
remo
t
e-bzr: update
o
ld organization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-13
Junio C Ha
m
ano
Git
1
.
8
.
3-
r
c2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-13
Junio
C
Hamano
Me
r
ge g
i
t://oz
l
abs
.
org/~paulus/
g
it
k
commit
|
commitdiff
|
tree
2013-05-11
T
orsten Bögershausen
te
s
t-bz
r
: do no
t
use unpo
r
t
able sed '\+'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-11
Ju
n
io
C
Ham
a
no
Merge g
i
t
:
//
g
it
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2013-05-10
Da
l
e
Worl
e
y
Coding
G
u
i
d
el
i
nes: Doc
u
mentation/*
.
txt are the sources
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
Junio C H
a
mano
Sync
w
ith
v1
.
8
.
2
.
3
commit
|
commitdiff
|
tree
2013-05-09
Junio C Hamano
Git 1
.
8
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
J
un
i
o C H
a
mano
Merge
b
ranch 'mv/seq
u
enc
e
r-pick-error-diag'
commit
|
commitdiff
|
tree
2013-05-09
Jun
i
o C
Haman
o
cherr
y
-pick: pic
k
in
g
a
tag that resolves to a comm
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
Junio C H
a
mano
Merge
b
r
anch 'tr/
c
opy-revisions-
f
ro
m
-
s
tdin'
i
nto maint
commit
|
commitdiff
|
tree
2013-05-09
René Scharfe
t5004: a
v
oid using tar for checking emptiness of ar
c
h
i
ve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
René Sc
h
arfe
t5004: ignore pax
g
lobal head
e
r fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
Davi
d
Ag
u
ilar
m
ergetools/kdiff3
:
d
o n
o
t
use --auto when diff
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-09
Feli
p
e Contreras
transport-
h
elper: tri
v
ial style cle
a
n
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
Junio C Hamano
Update dr
a
ft release
not
e
s fo
r
1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
Felipe Contreras
remote-helpers: trivi
a
l cleanup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
Felipe
Contrera
s
remote-bz
r
: fix f
o
r disa
p
pear
e
d
revisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-08
Jun
i
o
C
Hamano
Merge gi
t
://github
.
com/gi
t
-
l
10n/git-po
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hamano
Merge branch 'jk/merge-tree
-
added-
i
dentically'
commit
|
commitdiff
|
tree
2013-05-07
J
ohn Keep
i
ng
merge-tre
e
: handl
e
directory/empty conflict corr
e
ct
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-07
Junio C Hamano
M
e
rge branch 'fc/remote-bzr'
commit
|
commitdiff
|
tree
2013-05-07
Felipe Contreras
remo
t
e-b
z
r: a
v
oid
b
ad
r
efs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-06
Felipe Contreras
remot
e
-bzr:
c
onvert
a
ll
u
ni
c
ode
k
eys
t
o st
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-05
Junio C Ham
a
n
o
M
e
rge br
a
nch 'fc/p
u
sh-with-export-reporti
n
g-resu
l
t'
commit
|
commitdiff
|
tree
2013-05-05
Feli
p
e Contreras
tr
a
n
s
port-helper: impro
v
e
p
u
s
h
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
J
u
n
i
o C Ha
m
a
n
o
Git 1
.
8
.
3
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-03
Junio C
H
a
mano
Mer
g
e branch
'
tr/unpack-e
n
try-us
e
-a
f
t
e
r-free-fix'
commit
|
commitdiff
|
tree
2013-05-03
J
u
n
i
o
C
H
a
mano
Sync wit
h
maint
commit
|
commitdiff
|
tree
2013-05-03
Ju
n
i
o C Hamano
Merge
b
ranch 't
r
/remote-t
i
ghten-
c
o
m
m
andline-parsing
.
.
.
commit
|
commitdiff
|
tree
2013-05-03
Ju
n
io C Ha
m
ano
Merge
b
ranc
h
'jn/glos
s
a
r
y-r
e
vision' into maint
commit
|
commitdiff
|
tree
2013-05-03
F
e
lipe Contreras
completion:
z
sh:
don't o
v
erride
suffix on _de
t
ault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-02
Anders Gransko
g
en
.
.
.
Documentat
i
on/git-commit: Typo under --edit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hamano
Update
d
r
a
ft re
l
ease notes to 1
.
8
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Marc
Branch
a
ud
Fix grammar in
the 1
.
8
.
3 release notes
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
J
u
nio
C
H
amano
M
e
rge bra
n
ch 'hb/git
-
pm-tempfile'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Ham
a
no
M
e
rge branch 'rs/p
p
-us
e
r-inf
o
-w
i
thout-extra-alloca
t
ion'
commit
|
commitdiff
|
tree
2013-05-01
Junio C Hama
n
o
Merge branch 'tr/remote-tight
e
n-commandline
-
p
a
rsing'
commit
|
commitdiff
|
tree
2013-05-01
Ju
n
io
C Haman
o
Merge branch
'zk/prompt-re
b
ase-step
'
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Contreras
remote-bzr: access b
r
anches on
l
y when needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrer
a
s
remote-bzr: delay peer bran
c
h usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Contreras
remote-bz
r
:
i
t
erate revisi
o
ns
p
rope
r
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Feli
p
e Contreras
remote
-
bzr: improve progress r
e
porting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
e
lipe Contreras
remote-b
z
r:
a
dd opt
i
on t
o
sp
e
cify branc
h
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
elipe Contreras
remote-bzr: add custo
m
m
e
t
hod to
fi
n
d br
a
nche
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe C
o
nt
r
e
r
as
r
e
m
ote
-
bzr:
improve author sanitazion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felip
e
Contr
e
ras
remote-bzr: add support
f
or
s
hared r
e
po
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
emo
t
e
-bzr: fix branch
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
el
i
pe Contreras
remote-b
z
r: ad
d
support for bzr repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fe
l
i
pe Contreras
remote-bzr: use
b
ranch
v
aria
b
le
when appro
p
r
iate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Fel
i
pe Contreras
rem
o
te-
b
z
r: f
i
x
p
art
i
a
l
l
y pushed merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
remote
-
bzr: fixes for br
a
nch diverge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contreras
r
e
mote-bzr: add s
u
pport to p
u
sh merge
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
Co
n
treras
rem
o
t
e
-
bzr
:
always t
r
y to update the worktr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe Contrera
s
remote-bzr:
fix o
r
d
er of locking in CustomTr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
F
e
li
p
e Contreras
remote-bzr:
delay blob fetching unt
i
l the v
e
ry end
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-05-01
Felipe
C
ontrer
a
s
r
emote-bzr
:
clean
u
p
CustomTree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-30
Th
o
mas Ras
t
unpack_entry: avo
i
d
f
reeing o
b
ject
s
in
ba
s
e
cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramkumar R
a
machand
r
a
git
-
c
ompl
e
tion
.
bas
h
:
add
r
emo
t
e
.
p
u
s
h
d
efault to config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
R
a
m
kum
a
r Ra
m
ach
a
ndra
git-com
p
l
etion
.
b
ash: a
d
d branch
.
*
.
p
u
shremote to config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Junio C Hamano
Mer
g
e branch '
m
aint
'
commit
|
commitdiff
|
tree
2013-04-29
Junio C
Hamano
Merge branc
h
'f
c
/zsh-c
o
mplet
i
on' into maint
commit
|
commitdiff
|
tree
2013-04-29
Fel
i
p
e
C
ontreras
co
m
plete: zsh:
use zsh completion for the mai
n
cmd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Fe
l
ipe Contrer
a
s
compl
e
te: zsh: trivial simplif
i
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
R
a
mkum
a
r Rama
c
han
d
ra
git-co
m
pletion
.
bash: complete
branc
h
.
*
.
r
e
base
a
s bo
o
lean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
Ramku
m
ar Rama
c
h
andra
git-comp
l
etion
.
bash: add d
i
ff
.
submodule t
o
config
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
R
amkumar Rama
c
handra
g
i
t
-
completion
.
bash: lexical sorting for diff
.
statGraphWidth
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-29
H
.
Merij
n
Brand
Git
.
pm: call tempfile from Fi
l
e::T
e
m
p
a
s
a
r
e
g
u
l
a
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Juni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-04-28
Felipe Co
n
treras
documentation:
t
rivial whitespace clea
n
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/Makefile: re
m
ove
s
m
oke test targets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
Junio C Haman
o
Merge branch 'nd/pretty-formats'
commit
|
commitdiff
|
tree
2013-04-28
Rams
a
y Jones
pretty: Fix bug in trunca
t
ion support for %>,
%<
and %><
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next