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: simplify API usage by removing more global variables
2009-04-12
David Aguilar
mer
g
etool--lib: simplify API usage by removing mo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-11
Ferry Hubert
s
Fix missp
e
lled mergetool
.
k
e
epBac
k
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/me
r
g
etool: refactor com
m
ands to
use git-merget
o
ol
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
u
ilar
me
r
g
e
tool: use $(
.
.
.
) ins
t
ead of `b
a
c
k
tic
k
s`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completi
o
n: add git-diffto
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l: ad
d
support for a
diff
t
ool
.
prompt config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
di
f
f
to
o
l: add v
a
riou
s
g
it-diff
t
ool
t
ests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
a
r
difftool:
move 'g
i
t-
d
i
f
ftool' ou
t
of
c
ontrib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Se
b
astian Pipping
d
iff
t
ool/merg
e
to
o
l: add di
f
fus
e
as me
r
ge an
d
d
iff tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
g
u
ilar
di
f
ftool: add a
-y shortcut for --no-prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
d
i
ffto
o
l
:
use perl built
-
ins when testing for
msys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool: re
m
ove
t
he backu
p
fi
l
e fe
a
t
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difft
o
ol: remov
e
mer
g
e options for opend
i
ff, tkdiff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
a
r
k
us Heidelberg
git
-
me
r
getool: add n
e
w
m
erg
e
tool Tort
o
iseMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Ma
r
ku
s
Heidelbe
r
g
gi
t
-merg
e
t
o
ol/di
f
ft
o
o
l
:
m
ake (g)vimdiff workable und
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelb
e
rg
doc/merg
e
-config: list ecmerge
as a built-in merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-list
.
txt: make
ascii markup uniform with o
t
her
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Mat
t
hieu Moy
git
-
send-ema
i
l
.
txt:
cl
a
r
i
fy which o
p
tions take an a
r
gume
n
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
J
u
nio C Hamano
Merge branch 'j
c
/name-branch'
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C Hama
n
o
Merg
e
b
r
a
nch 'jc
/
shared-literally'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
M
e
rge branch 'mg/tracked-local-branches'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ham
a
no
Merge bra
n
ch 's
b
/format-patch-p
a
tchnam
e
'
commit
|
commitdiff
|
tree
2009-04-06
Felipe Con
t
r
e
ras
u
s
er-ma
n
ual
:
the name of t
h
e
hash func
t
ion
i
s
S
H
A-1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Con
t
re
r
as
docbook: ch
a
nge css style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Co
n
treras
use
r
-manual: re
m
ove some git-foo usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
Do
c
umentat
i
o
n: branch
.
*
.
merge can a
l
so a
f
f
ect 'git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Add configuration varia
b
le for sign-off to fo
r
ma
t
-
patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Tod
d
Zullinger
bash completion
:
Update
'
git am'
op
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
u
nio C
Hamano
M
e
rge
bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjo
u
git
s
u
bmo
d
ule
:
f
ix
u
sage li
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge branch 'main
t
-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-04-05
J
u
n
i
o C
H
amano
Merge branch
'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelbe
r
g
doc/g
i
t-pack-refs
:
fix two grammar iss
u
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
te
s
ts: remove exit after tes
t
_done c
a
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: ab
o
rt commit if
interactive add failed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Christi
a
n Cou
d
er
bis
e
ct: i
m
pr
o
ve error
m
essage
w
h
en bran
c
h checkout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan
M
cGee
g
i
t-repack: use non-dashed upda
t
e-se
r
ver-
i
nfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
J
a
y S
o
ffian
send-email: fix nasty bug in
as
k
() functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Update draft release notes to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ham
a
no
S
ync with
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
G
IT
1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
M
erge bran
c
h 'jc
/
m
ain
t
-
1
.
6
.
0-blame-
s
' into main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
Merge branch 'js/main
t
-diff
-
t
e
mp-smudge' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'js/maint-1
.
6
.
0-exec-path
-
env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hama
n
o
Mer
g
e branch
'
bc
/
main
t
-1
.
6
.
1-br
a
nc
h
-d
e
leted-was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
e
rge branch '
t
r/maint-1
.
6
.
1
-doc-forma
t
-patch--ro
o
t
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'dm/maint-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay So
f
fian
send-e
m
ail: ensure quoted addresses are
r
fc20
4
7 enco
d
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ian
send-email:
c
orrec
t
t
w
o
tests
which were go
i
ng interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Hama
n
o
Me
r
ge branch 'ef/fast-e
x
port'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge br
a
nch 'mh/forma
t
-patch-a
d
d-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
g
e
branch 'tr/maint-1
.
6
.
1
-
doc-for
m
at-patch
-
-root'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hamano
Merge branch
'ma
i
n
t'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge b
r
anc
h
'maint
-
1
.
6
.
1
'
into m
a
in
t
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C Hama
n
o
Merge
b
ranch 'ma
i
nt-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge
b
ranch 'cj/do
c
-
f
ormat'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merg
e
bran
c
h
'jc/mai
n
t-1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Mer
g
e
bra
n
ch '
k
b/trac
k
in
g
-c
o
unt-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley
J
.
Landaker
Documentation: git-svn: fix trunk/
f
et
c
h svn-remo
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Björn Steinbrink
Mai
l
map: A
l
l
ow
e
mp
t
y email
a
dd
r
esses to be mapped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael J Grube
r
Make local bran
c
hes
b
ehav
e
l
ike remote branches when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Voigt
Cleanup war
n
ing
about
known issu
e
s in cvsim
p
or
t
docume
n
t
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
H
o
l
ger Weiß
Docume
n
tatio
n
:
Remov
e
an o
d
d "instea
d
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffi
a
n
send-email: ask_d
e
fault shoul
d
apply to all emails
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay
S
offian
send-e
m
ail:
d
on't attemp
t
to
p
rompt if tty
is close
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t130
1
:
loosen test for for
c
ed modes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jef
f
King
fix po
r
ta
b
ili
t
y pr
o
blem wi
t
h
I
S_RUN
_
COMMAND_ERR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Stephen Boyd
fo
r
mat_sanitiz
e
d_sub
j
ect: Don't trim past initi
a
l len
g
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Chris Jo
h
n
s
e
n
Document
a
t
i
on: use "spuriou
s
.
sp" XSLT if
DOCBOOK_SUPPRESS_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Johannes Schindel
i
n
m
ailmap:
resurre
c
t lower-casing of ema
i
l a
d
dresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Hamano
M
erge git://git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
buil
t
in-clon
e
.
c: no
n
e
ed
to strdup for setenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
bui
l
tin-clone
.
c: make junk_pi
d
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
amano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
U
p
d
a
te
d
raft rele
a
se
n
otes
to 1
.
6
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C
Hamano
Merge b
r
anch 'maint-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Me
r
ge br
a
nch
'
maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
S
a
nti Béja
r
Documentation
:
push
.
d
e
f
ault
a
ppl
i
es to all remotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Santi Bé
j
ar
D
o
cumentation: enhance
b
ranc
h
.
<name>
.
{remote,merge
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Daniel Cheng (aka
.
.
.
F
ix bash completion in
p
ath with spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
bash completion:
o
nly
show 'l
o
g --merg
e
' if merging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nico -t
e
lmich-
S
chot
.
.
.
git
-
tag(1):
ad
d
hint about co
m
mi
t
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caf
f
ee
Doc
u
mentation: upda
t
e
graph api
e
xample
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Ham
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hama
n
o
Me
r
ge bra
n
ch 'maint-1
.
6
.
1
'
into maint
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Haman
o
M
e
r
g
e branch 'maint-1
.
6
.
0' into main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-em
a
il: add te
s
ts
f
or refactored prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-email: refactor and en
s
ure prompting doe
s
n
't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
g
i
t
-s
v
n
: fix ls-tree usa
g
e with dash-pref
i
xed paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johannes Schindelin
i
m
port-zip
s
: fix th
i
n
ko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik
F
aye-L
u
nd
builtin-fast-export
.
c: hand
l
e
nested tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik F
a
ye-Lu
n
d
built
i
n-fast-export
.
c: fix crash on t
a
gged
t
rees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-L
u
nd
builti
n
-f
a
st-ex
p
ort
.
c:
tu
r
n
e
r
ror in
t
o
warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-L
u
nd
test-suite: addin
g
a t
e
st for fast-export with tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hamano
se
t
_shared_perm(): som
e
times
w
e k
n
ow what the final
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
mo
v
e_temp_to_fi
l
e(): do not f
o
r
get to
chm
o
d(
)
in "Coda
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C
H
a
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-03-28
J
u
n
io
C
Ham
a
no
Updat
e
draft release notes to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C
H
amano
Me
r
g
e
branch 'jc/
m
a
int-1
.
6
.
0-diff-bo
r
row-c
a
ref
u
l
l
y'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ha
m
a
n
o
Merge bra
n
ch 'js/
r
emote-improvements'
commit
|
commitdiff
|
tree
next