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
difftool/mergetool: refactor commands to use git-mergetool--lib
2009-04-08
D
a
vid
A
guilar
difftool/me
r
get
o
ol: refacto
r
comman
d
s to use git-m
e
rget
o
ol
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
mergetool:
u
s
e
$(
.
.
.
)
ins
t
ead o
f
`b
a
ckticks`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
bas
h
comp
l
etion: add
g
it-
d
i
ff
t
ool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difftool: add support for a diff
t
o
ol
.
prompt config
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool: add vari
o
u
s
git-dif
f
tool
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
Aguilar
difftool: move 'git-diffto
o
l' out o
f
contrib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Sebastia
n
Pipping
d
iff
t
ool/merge
t
ool: add
diffu
s
e as merge a
n
d diff tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add a -
y
s
ho
r
t
cut for
--no-
p
romp
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agu
i
lar
diff
t
ool: use perl built-ins
when te
s
ti
n
g for msys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Agu
i
la
r
difftool:
rem
o
ve the backup file fea
t
ure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
di
f
fto
o
l:
remove merge opt
i
o
n
s for
opendi
f
f
, tkdiff
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus
H
eidelber
g
git-m
e
rge
t
ool: a
d
d
n
ew merg
e
tool T
o
rtoi
s
eMerge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Markus Heidelber
g
g
i
t-merge
t
ool/difft
o
ol: make
(g
)
vimdiff wo
r
k
a
ble under
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
M
arkus H
e
i
delber
g
d
o
c
/
m
e
rge-
c
o
n
f
i
g
: list ecm
e
rge as a built-in m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
it-rev-list
.
txt: make
a
scii markup
uniform wi
t
h
other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu
M
o
y
git
-
send-email
.
txt: clarify which options take an argum
e
n
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C Haman
o
M
erge bra
n
ch 'jc/name-branch'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ha
m
ano
M
e
rge branch 'jc/shared-lit
e
r
a
l
ly'
commit
|
commitdiff
|
tree
2009-04-06
Junio C
H
amano
Merge branc
h
'mg
/
tracked-local-branches'
commit
|
commitdiff
|
tree
2009-04-06
J
unio C Ham
a
no
Mer
g
e bran
c
h 'sb/format-patch-patchn
a
me'
commit
|
commitdiff
|
tree
2009-04-06
F
e
lipe Contreras
user-manual: 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
Contreras
do
c
b
o
ok:
change css style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Contreras
u
ser-man
u
a
l
: remo
v
e
some
git
-
foo us
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Santi Béjar
Documentation: branc
h
.
*
.
m
e
rge can also affect 'gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voig
t
A
d
d configuration vari
a
ble for s
i
g
n
-off to form
a
t-patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Todd Z
u
llin
g
er
bash completion
:
Update '
g
it am' op
t
ion
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ham
a
no
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-05
Jul
i
en Danjou
git submodule: fix
u
sage line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Junio C
H
a
mano
Merge
br
a
nch 'maint-1
.
6
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge br
a
nch 'maint-1
.
6
.
0
'
into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
M
a
r
k
us
H
eid
e
l
b
er
g
doc/git-pac
k
-
refs: fix two gra
m
mar issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
tests: remo
v
e
exit af
t
e
r te
s
t
_
d
one call
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jeff King
commit: abort
com
m
it
if in
t
eractive add faile
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect: improve error
m
essage
w
h
en branch c
h
e
ckout
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
git-repack: use no
n
-
d
a
shed upd
a
te-se
r
ver
-
info
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
send-email:
f
i
x
n
asty bug in ask() function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Update draft release note
s
to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
J
unio C H
a
m
a
no
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 Hama
n
o
Merge bra
n
ch 'jc
/
maint
-
1
.
6
.
0-blame-
s
' in
t
o m
a
int
commit
|
commitdiff
|
tree
2009-04-02
J
unio C H
a
man
o
Merge
b
r
a
nch
'js/maint-diff-temp-smudge' into main
t
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
M
erge bran
c
h 'js/maint-1
.
6
.
0-exec-path-env' into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Ha
m
ano
Merge branch
'bc/maint-1
.
6
.
1-branch-deleted-was'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge b
r
anch
'
tr/
m
aint-1
.
6
.
1
-
doc-
f
orma
t
-patch-
-
r
o
ot
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Junio C
Haman
o
M
e
rge branch 'dm/maint-docco' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay Soffian
se
n
d-email: ensure
q
uoted add
r
esses are rfc2047 encoded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Jay
S
off
i
an
s
end-emai
l
: corre
c
t
t
w
o tests which were
going interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-02
Junio C
H
amano
Merge branch 'ef/fast-export'
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Ha
m
ano
Merge branch 'mh
/
format-pat
c
h-add-header
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch 'tr
/
main
t
-1
.
6
.
1
-doc-format-patch--root
'
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C Hamano
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hama
n
o
Merge
b
ranch 'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merg
e
b
r
anc
h
'
maint-1
.
6
.
0'
i
nt
o
m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Ham
a
no
Merge
branch
'
cj/doc-f
o
rmat'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
ano
M
er
g
e
branch 'jc/m
a
in
t
-
1
.
6
.
0-keep-pack'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C
Ha
m
a
no
M
e
rge br
a
nch 'kb/tra
c
ki
n
g-count-n
o
-merg
e
s'
commit
|
commitdiff
|
tree
2009-04-02
Wesley J
.
L
and
a
ker
D
o
cumentation
:
g
it-svn: fix trunk/fe
t
ch svn-remote
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Björn Steinbrink
Mailmap:
Allow empty emai
l
ad
d
re
s
ses
t
o
be
m
a
pped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Michael J Gruber
Make local branches behave like
r
emote
b
ranches whe
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
He
i
k
o
Voigt
C
l
eanup warni
n
g
ab
o
ut kn
o
w
n issues in cvsimport documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
H
o
lge
r
Weiß
Docu
m
e
ntation: Rem
o
ve a
n
odd
"
ins
t
ead"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
se
n
d
-email:
ask_default should ap
p
ly to al
l
em
a
il
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jay Soffian
send-email: don't attemp
t
t
o
prompt
i
f tty is close
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jeff
K
ing
t1301
:
loose
n
test for f
o
r
c
ed modes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Je
f
f
King
fix portabi
l
ity problem with IS_R
U
N_
C
OMMAND_ER
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
St
e
p
h
en
B
oyd
f
ormat_sanitize
d
_subject:
Don't trim
past in
i
tial
lengt
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ch
r
i
s Joh
n
sen
Documentati
o
n
:
use
"spurious
.
s
p
" X
S
LT if DOCB
O
O
K
_SUPPRESS_S
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Joha
n
nes Schindeli
n
mailmap:
r
esurrect l
o
wer-casing of
em
a
il addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Jun
i
o C Ham
a
no
Merge
g
it://git
.
bo
g
omips
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2009-04-01
Ali Gh
o
lami Rudi
b
u
iltin-clone
.
c: no need
to strdup for
s
etenv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-01
Ali Ghol
a
mi
R
udi
builtin-clone
.
c: make
junk_pid static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
J
unio C Hamano
M
e
rge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2009-03-30
Junio C Ha
m
an
o
Update dra
f
t 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 Hamano
Merge branch 'maint-1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-03-30
J
u
nio
C
Haman
o
Merge bran
c
h 'm
a
i
nt
-
1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentat
i
on: push
.
default
a
pplies to
all remote
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Santi Béjar
Documentation
:
enhanc
e
branch
.
<name>
.
{remote,
m
erge
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
D
a
niel Ch
e
ng (ak
a
.
.
.
Fix bash completion in path with spaces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Thom
a
s
Rast
bash complet
i
on:
only show 'log
-
-merg
e
' if merging
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Nic
o
-telmich-
Schot
.
.
.
git-tag(
1
): add
hint about commit
messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Allan Caff
e
e
Doc
u
mentat
i
on: update graph a
p
i
e
xample
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Junio C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-03-30
Juni
o
C Hamano
Merge bra
n
ch 'maint-
1
.
6
.
1' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-03-30
Junio C Hamano
Merge branch 'ma
i
nt-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-03-30
Jay Soffian
send-email
:
ad
d
tests for
refactore
d
prompting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Jay
S
offian
send
-
email: refac
t
o
r
and
e
n
s
u
r
e
p
rompti
n
g doe
s
n't loop
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Eric Wong
git-svn:
fix
l
s
-
t
ree usa
g
e
w
ith dash-prefi
x
ed
p
aths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Johannes S
c
hind
e
lin
impo
r
t-zips: fix t
h
i
n
ko
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik
F
ay
e
-
Lund
bui
l
tin-fast-ex
p
ort
.
c: handle nested ta
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
E
r
ik Fa
y
e-Lund
b
uilti
n
-fas
t
-export
.
c: f
i
x
c
r
ash o
n
tagg
e
d
t
rees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik Faye
-
Lund
builtin-fas
t
-export
.
c: turn
error into warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-30
Erik
F
aye-Lund
test-suite: a
d
ding a test fo
r
fast-export
w
ith
tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
s
et_shared_perm(): sometimes w
e
know what the final
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
move_tem
p
_to_fi
l
e()
:
do not fo
r
get to chmod() in "Coda
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio
C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Haman
o
Update
draft release
no
t
es to 1
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-03-28
Junio C Hamano
Merge bra
n
ch 'jc/main
t
-1
.
6
.
0-di
f
f-borr
o
w-
c
arefully'
commit
|
commitdiff
|
tree
2009-03-28
Juni
o
C Haman
o
Merge branch
'
j
s/re
m
ote-improvements'
commit
|
commitdiff
|
tree
2009-03-28
Junio C Ham
a
no
Me
r
ge branch 'jk/
c
lone-pos
t
-che
c
kout'
commit
|
commitdiff
|
tree
2009-03-28
J
u
nio C Hamano
Merg
e
branch 'maint-1
.
6
.
1'
i
nto
m
aint
commit
|
commitdiff
|
tree
next