repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: move 'git-difftool' out of contrib
2009-04-08
Davi
d
Ag
u
ilar
difftool: move
'git-
d
ifftool'
ou
t
o
f
con
t
rib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sebasti
a
n
P
i
pping
di
f
ftool/mergetool: add diffu
s
e as merge and diff
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
i
fftool:
a
d
d a -y s
h
ortcut fo
r
-
-
n
o-pro
m
pt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
di
f
ftool: us
e
perl built-i
n
s
wh
e
n
t
e
s
ting
for msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: rem
o
ve the backu
p
f
ile feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: remov
e
merge opti
o
n
s
for
o
pendiff, tkdiff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelberg
g
i
t
-mergetool: add new merge
tool Tortoi
s
eMerge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
ark
u
s
H
eidelber
g
g
it-mergetool/di
f
ftool: make
(
g
)vimdiff workable
u
n
der
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Markus H
e
id
e
lber
g
doc/merge-config: list e
c
merge
a
s a b
u
ilt
-
i
n
merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git-rev-
l
ist
.
txt: mak
e
ascii mar
k
up uniform with
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Moy
git-send-emai
l
.
txt: c
l
ar
i
fy which
options t
a
ke an argum
e
nt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C Hamano
Merge branch '
j
c/n
a
me-branch'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Hamano
Merge branch 'jc/sh
a
red-lit
e
rally'
commit
|
commitdiff
|
tree
2009-04-06
J
u
n
i
o C
Hamano
Me
r
ge branch
'
mg
/
tracked-
l
ocal-b
r
anche
s
'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
M
e
r
g
e bra
n
c
h
's
b
/f
o
rm
a
t-patch-patchname'
commit
|
commitdiff
|
tree
2009-04-06
Felipe C
o
ntreras
user-m
a
nual: the name of the hash
function is SHA-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe C
o
ntreras
docbook: ch
a
nge css s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
use
r
-
manual
:
remove
s
ome git-foo usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Santi B
é
jar
Documentat
i
o
n
:
branch
.
*
.
merge
c
a
n a
l
so affect 'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
H
eik
o
V
o
igt
Add configur
a
ti
o
n variable for sign-off to format
-
patch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash completion: Update 'git a
m
'
o
pt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-04-05
Julien Danjou
g
i
t
s
u
bm
o
du
l
e
: fix usage line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ju
n
io C Hamano
Merge branch 'ma
i
nt-1
.
6
.
1' into
m
a
in
t
commit
|
commitdiff
|
tree
2009-04-05
Jun
i
o
C Hamano
M
e
rge branch
'ma
i
nt-1
.
6
.
0'
i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
doc/git
-
pa
c
k-ref
s
: fix
t
wo grammar issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff
Kin
g
t
ests: remove ex
i
t
after test_done call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
c
o
mmit: a
b
ort comm
i
t if interact
i
ve add
f
ailed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
bise
c
t: im
p
rov
e
error message
w
h
e
n branch checko
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
gi
t
-rep
a
ck
:
u
s
e n
o
n-
d
ash
e
d updat
e
-s
e
rver-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-email: f
i
x nasty bug in
ask() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Updat
e
d
raft r
e
lease
note
s
to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C H
a
mano
Sync with
1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
io C Hamano
GIT 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C H
a
mano
Merge branch 'jc/ma
i
nt-1
.
6
.
0-blame-s' into main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge bra
n
ch 'j
s
/maint-diff-
t
emp-smudge' i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge bran
c
h
'
js/ma
i
nt-
1
.
6
.
0-e
x
e
c-pat
h
-env' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
Ju
n
i
o C Hamano
Merge bra
n
ch 'bc/maint-1
.
6
.
1-branch-delet
e
d
-
was' into
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Merge branch 'tr/m
a
int-1
.
6
.
1-doc-
f
o
rmat
-
pa
t
ch--root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge b
r
anch 'dm/main
t
-d
o
cco'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-
e
mail:
e
nsure quote
d
addresses
are rfc2047 encod
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
send-email: correct two
t
ests which were going inte
r
act
i
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'ef/
f
ast
-
exp
o
rt'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Ha
m
ano
Mer
g
e
b
r
anc
h
'
m
h
/
f
o
rmat-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Haman
o
Merge
branch 'tr/maint-1
.
6
.
1-d
o
c-format-patch--
r
oot'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C
Hamano
Merge
branch 'maint
'
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
Merge branch
'main
t
-
1
.
6
.
1' in
t
o m
a
in
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'maint-1
.
6
.
0
'
in
t
o maint
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hama
n
o
Merge branch 'cj/doc-format'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge br
a
nch 'jc/maint-1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Hamano
Merge bra
n
ch '
k
b/tracki
n
g
-
coun
t
-no-merges'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
Landak
e
r
Doc
u
mentation: g
i
t-svn:
f
i
x trunk/fetch svn
-
r
emote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Björn Steinbrink
Mailmap:
A
llow
emp
t
y
e
mail addresses to
be mappe
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Micha
e
l J G
r
u
b
er
M
ake local bran
c
hes behave l
i
ke remot
e
branches when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Vo
i
gt
Cleanup warning abou
t
known
i
s
sues in cvsimport document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
H
o
l
g
er Weiß
D
o
cumentation: Remov
e
an
o
dd "instea
d
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jay S
o
ffian
sen
d
-emai
l
: a
s
k_defa
u
l
t
should apply to a
l
l emails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
J
ay Soffian
s
e
nd-em
a
il:
d
o
n'
t
at
t
empt t
o
prom
p
t
i
f tty is c
l
osed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
t
1
301
:
loosen test for forced
mo
d
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Jeff King
fix portabili
t
y problem with IS_RUN_
C
OMMAND_ERR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
S
t
ephen
B
oyd
f
o
rm
a
t_sanitized_su
b
ject: Don't trim past initial lengt
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Chris J
o
h
n
sen
D
o
c
ument
a
tion: use "spurious
.
sp" XSLT
i
f D
O
CBOOK
_
SUPPRESS_S
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Johanne
s
Sch
i
n
delin
m
a
i
l
map: resu
r
re
c
t lowe
r
-casing of e
m
ail addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Junio C Hamano
Merge git://git
.
b
ogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholami Rudi
builtin-c
l
one
.
c: no ne
e
d to strdup for set
e
n
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-01
Ali Gholam
i
Rud
i
builtin-cl
o
ne
.
c: make
junk_pid
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
aman
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C Hamano
Updat
e
draft release notes to 1
.
6
.
2
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Jun
i
o C H
a
mano
Me
r
ge
branch '
m
aint-1
.
6
.
1' into
mai
n
t
commit
|
commitdiff
|
tree
2009-03-30
J
unio C Ham
a
no
Merge bran
c
h 'ma
i
nt-1
.
6
.
0' i
n
to maint-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béj
a
r
Documentation: push
.
default applies to al
l
r
emote
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Santi B
é
jar
Documentat
i
on: enhance
branch
.
<name>
.
{remote,merge}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Dani
e
l Cheng (aka
.
.
.
Fix
b
ash complet
i
on in path wit
h
s
p
a
ces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
T
homas
R
a
s
t
bash co
m
pletion: only show 'log
--merge' if
mer
g
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Nico -telmich- Schot
.
.
.
git
-
tag
(
1): add hint
a
bou
t
c
o
mm
i
t messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Allan
C
affee
Docum
e
ntat
i
on: update gr
a
ph ap
i
example
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Haman
o
Merg
e
branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
Junio
C Hamano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffia
n
send-email: ad
d
tests for refactored prompting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
J
ay So
f
fi
a
n
s
e
nd-email: refa
c
tor
a
n
d ensure p
r
o
mptin
g
d
oesn
'
t loop
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn: fix ls-
t
r
e
e usage with dash-p
r
efi
x
ed paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Johannes
S
chindelin
i
mpor
t
-zips: fix th
i
nko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Faye
-
Lund
bu
i
ltin-fast-exp
o
rt
.
c:
handle nes
t
e
d
tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
b
u
iltin-f
a
st-export
.
c: fix
crash on tagged tr
e
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye-Lund
builtin-
f
a
s
t-exp
o
rt
.
c
: turn
e
rror into warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-30
Erik F
a
y
e
-Lund
test-suite: adding a
t
est for fast-export with
t
ag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
unio C Hamano
set_shared_per
m
(): some
t
imes we kno
w
w
h
at the fi
n
al
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ha
m
a
no
move_temp_
t
o_file(): do
n
ot fo
r
get to chmod() in "Coda
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge
branch '
m
a
i
n
t
'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Upd
a
t
e d
r
af
t
releas
e
notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
J
unio C
Hamano
Me
r
ge branch 'jc/maint-1
.
6
.
0-diff-
b
orrow-carefully'
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Ha
m
ano
Merge
branch 'js/re
m
ote-improvements'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Mer
g
e br
a
nch 'jk/clon
e
-post
-
checkout'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' i
n
to maint
commit
|
commitdiff
|
tree
2009-03-28
Em
i
l Sit
t
est-lib: Cl
e
an u
p
co
m
me
n
ts a
n
d Makefile
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Micha
e
l H
e
nd
r
icks
format-pat
c
h: add
a
rb
i
tr
a
r
y
e
mail header
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
Move chm
o
d(foo, 0444) into move_temp_t
o
_fil
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-28
Ju
n
io C
H
am
a
n
o
"core
.
sh
a
redrepos
i
t
o
r
y
=
0mode"
s
houl
d
s
et, no
t
loose
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-03-27
Mic
h
ele B
a
l
labio
rebase: f
i
x ty
p
o (force_rebas -> f
o
r
c
e-rebas)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next