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
Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-04-09
J
e
f
f
K
ing
Makefile:
a
l
l
o
w
buildi
n
g with
o
ut pe
r
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Mo
y
git-p
u
ll
.
sh: better warning message for "git p
u
ll"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
/
merge
t
ool: ref
a
ctor commands to use git-mer
g
etool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
branc
h
:
show upstream br
a
nc
h
when double verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff
K
ing
m
ake ge
t
_short_re
f
a
public
f
u
n
ct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
for-each-ref: add "upstream" format field
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jeff King
f
o
r
-
eac
h
-
r
e
f
: re
f
a
cto
r
refname
handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jun
i
o C Hamano
Mer
g
e br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge
b
ranch 'main
t
-1
.
6
.
1' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2009-04-08
Jar
i
Aalto
C
h
ange double qu
o
tes to single
q
uotes
i
n message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Junio
C Hamano
Merge branch '
m
ain
t
-1
.
6
.
0
' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
M
e
rge b
r
anch 'lt/reflog-expir
e
'
commit
|
commitdiff
|
tree
2009-04-08
Junio
C Haman
o
Me
r
g
e branc
h
'bs
/
ma
i
nt
-
1
.
6
.
0-tree-walk-prefix'
commit
|
commitdiff
|
tree
2009-04-08
J
u
n
i
o C Haman
o
M
e
r
g
e branch 'ms/http-a
u
th'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge
b
ra
n
ch 'js/
m
aint-submodule-checkou
t
'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Ha
m
ano
Mer
g
e b
r
anch 'cb/ma
i
nt
-
merge-
r
ecursive-
s
u
bmod
u
le
-
fix
'
commit
|
commitdiff
|
tree
2009-04-08
Junio C Hamano
Merge branch
'mh/html-
p
ath'
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
mergetool:
u
s
e
$
(
.
.
.
) instead
o
f
`
backticks`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash comple
t
ion: add
gi
t
-difftool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool
:
add support for a difftool
.
prom
p
t config
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add variou
s
git-
d
ifftool test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: m
o
ve 'git-diff
t
ool' out
o
f contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sebastian
P
ipping
difftool/mergetool: add diff
u
se as merge
a
nd diff tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
d
d
a
-y
shortcut for --no
-
prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
difft
o
ol
:
use perl built-ins wh
e
n
t
esting for
msys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool
:
remove the backup f
i
le feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: remove merge options for ope
n
diff, tkdi
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Mar
k
us He
i
delberg
git
-
merge
t
ool: add new
merge t
o
ol Tortoise
M
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
a
rkus
Heidelbe
r
g
git-mer
g
eto
o
l
/
d
i
fftool: make (g)vimdiff workabl
e
under
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Marku
s
Heidelber
g
doc/merge
-
c
o
nfig: list ecmerge as a
b
uilt-in merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
C
h
ristian Couder
rev-lis
t
: add "in
t
bis
e
c
t
_show_f
l
ags" in "struct rev_lis
t
_info"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
C
h
ristian Couder
rev-list: remove last sta
t
ic vars used in "show_com
m
it"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Christian Coude
r
list-obje
c
ts:
ad
d
"void *
d
ata" parameter
t
o show functi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
g
it-rev-list
.
txt: m
a
ke as
c
ii markup
uniform with oth
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matthieu Moy
git
-
send-email
.
t
x
t: clarify whic
h
options ta
k
e
an argum
e
nt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ff King
for-each-ref: refactor get_
s
h
o
r
t_ref func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Sa
n
ti Bé
j
ar
Docume
n
tation
:
I
n
trod
u
ce
"
upstream bra
n
ch"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Jason Mer
r
ill
Docume
n
tation: clarify
.
gitattributes search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Matt
h
ie
u
Moy
gi
t
-
che
c
kout
.
t
xt: c
l
arify that <branch> app
l
ies when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
M
atthieu Moy
git-checkout
.
tx
t
: fix incorre
c
t statement a
b
out
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
F
inn Arne Gangs
t
a
d
git remote update: Fallback to remote i
f
gro
u
p do
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
F
inn Arne
G
angstad
remote: New funct
i
on
r
e
mote_is_config
u
red()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-08
Finn A
r
n
e
Gangstad
gi
t
r
em
o
t
e update:
Report
error f
o
r
n
o
n
-exis
t
i
ng groups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Junio C
H
am
a
no
sha1-lo
o
kup: fix up the
asserti
o
n messag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C Hama
n
o
Merge branc
h
'
j
c/name-br
a
nch'
commit
|
commitdiff
|
tree
2009-04-06
Juni
o
C Hamano
Merge branch 'jc/sh
a
red-l
i
terally'
commit
|
commitdiff
|
tree
2009-04-06
Jun
i
o C Hamano
Merge branch
'mg/tra
c
ked-l
o
cal-bran
c
hes'
commit
|
commitdiff
|
tree
2009-04-06
Junio C Ham
a
no
Merge bran
c
h 'sb/fo
r
mat-patc
h
-pa
t
c
hname'
commit
|
commitdiff
|
tree
2009-04-06
Felipe
Contreras
user-ma
n
u
al: the name of the hash fun
c
t
io
n
is SH
A
-1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Co
n
t
r
eras
docbook: chang
e
cs
s
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Felipe Co
n
t
re
r
as
user-m
a
nual: remov
e
some git-foo u
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
S
a
nti Béj
a
r
Documentation: branch
.
*
.
mer
g
e ca
n
also
af
f
e
c
t
'git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voigt
Ad
d
con
f
iguration
var
i
able
f
o
r
sign-off to
format-pat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Todd Zullinger
bash
comp
l
etion: Update 'git am' options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Finn Arne Gangstad
git r
e
mo
t
e
update:
N
ew option
--pr
u
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Finn Arne Gangst
a
d
builtin-r
e
m
o
te
.
c:
S
p
lit out pru
n
e_remo
t
e as a
separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect--helper: st
r
ing output va
r
i
a
b
l
es
tog
e
t
h
er with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
r
e
v-list:
pa
s
s "int f
l
ags" as
la
s
t arg
u
men
t
of "show_bisect_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian
C
ouder
t6030: test bisecti
n
g wit
h
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
bisect
:
u
se
"bisect--helper"
and remove "f
i
lter_skipped
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian
Couder
b
i
sect: i
m
plement "read_b
i
sect
_
paths" to r
e
ad paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
b
isect--helper: i
m
pl
e
ment "git bisect
-
-
he
l
p
er"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Ch
r
i
stian Couder
bisect: us
e
t
h
e new generic "sha1_p
o
s" func
t
ion to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Chris
t
i
a
n
Couder
rev-list: call new "filter_
s
ki
p
" funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
J
u
ni
o
C
H
amano
M
e
rge
br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-04-05
J
u
l
i
en Danjou
git submo
d
u
l
e: fix usage line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C Hamano
Merge branch 'maint-1
.
6
.
1
'
in
t
o maint
commit
|
commitdiff
|
tree
2009-04-05
Junio C Ha
m
ano
Merge branc
h
'maint-1
.
6
.
0'
i
nto
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-05
Markus H
e
i
delberg
doc/git-pac
k
-refs: fi
x
t
w
o grammar
i
ssues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jef
f
K
ing
tests: remove
e
x
it after test_
d
one call
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Je
f
f King
co
m
mit: a
b
o
r
t commit if interac
t
ive add failed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Clemens Buchacher
s
i
mpl
i
fy ou
t
put of conflicti
n
g
merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
le
m
ens Buchach
e
r
u
pdate cac
h
e
for con
f
l
i
c
t
ing su
b
mo
d
ule entr
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
C
l
e
m
ens Buchacher
add tes
t
s fo
r
mergi
n
g wi
t
h s
u
bmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Chr
i
stian Couder
bisec
t
:
i
mpr
o
v
e er
r
o
r
m
essa
g
e when branch checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Dan McGee
git-repack: use non-dashed u
p
date
-
server-info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidel
b
erg
add --html-path to get the locati
o
n of installed
H
T
ML
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Junio C
Hamano
Merge
b
ranch '
c
c/sha1-bsearch' into
HEAD
commit
|
commitdiff
|
tree
2009-04-05
Christian Couder
patc
h
-i
d
s: use the new generi
c
"sha1_po
s
" fu
n
ction
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Christian Cou
d
er
sha1-loo
k
u
p: add new "sha1_pos" fu
n
ction to efficiently
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-05
Jay Soffian
s
e
nd-e
m
a
i
l:
f
i
x
nasty bug in ask() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
un
i
o
C Hamano
Update draft relea
s
e notes to 1
.
6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Joha
n
nes Schindel
i
n
Fix 'git
c
heck
o
ut
<submodule>' to
u
p
d
ate the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Martin
Storsjö
Al
l
ow curl to rewind the
r
ea
d
buffers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jun
i
o C H
a
ma
n
o
Sync 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
Juni
o
C
Haman
o
Mer
g
e bra
n
c
h
'
jc/m
a
int-1
.
6
.
0-blame-s' into
m
aint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch
'js/m
a
int-diff-
t
emp-smudge' into mai
n
t
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hama
n
o
Merge
b
ranch 'js
/
m
a
i
n
t-1
.
6
.
0-
e
xec-
p
a
th-env
'
i
nto maint
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Me
r
ge
branch
'bc/main
t
-1
.
6
.
1-b
r
anch-de
l
eted-was'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
J
u
n
i
o
C Hamano
Merge bra
n
ch 'tr/
m
ai
n
t-1
.
6
.
1
-
doc-format-pa
t
ch-
-
root
.
.
.
commit
|
commitdiff
|
tree
2009-04-02
Juni
o
C Hamano
M
e
rge branch 'dm
/
maint-
d
occo' into maint
commit
|
commitdiff
|
tree
2009-04-02
Jay So
f
fian
send-em
a
il: ensure quoted
a
dd
r
esses ar
e
rf
c
2047 encode
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
Jay Sof
f
ian
s
end-email: correct two tests
w
hich were goin
g
interac
t
iv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio C
H
a
mano
Mer
g
e branch
'
ef/fast-exp
o
rt'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branch '
m
h/fo
r
m
at-patch-add-header'
commit
|
commitdiff
|
tree
2009-04-02
Junio C Hamano
Merge branc
h
'
t
r/maint-1
.
6
.
1-d
o
c
-
format-
p
a
tch--root'
commit
|
commitdiff
|
tree
2009-04-02
Junio
C Ham
a
no
Mer
g
e branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-04-02
J
u
nio
C Hama
n
o
Merge
br
a
nch 'ma
i
nt-1
.
6
.
1
'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-02
J
unio C Hamano
Me
r
ge branch 'maint-1
.
6
.
0
'
into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
next