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--helper: Remove use of the GIT_MERGE_TOOL variable
2010-01-10
David Aguil
a
r
difft
o
ol--helper:
R
emove use o
f
the GIT_MERGE_TOOL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftoo
l
-
-he
l
pe
r
: Update copyri
g
ht and remove dist
r
acting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguil
a
r
g
i
t-dif
f
tool: Add '-
-
gu
i
' fo
r
select
i
n
g
a GUI tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
t7800-difftool: Set a bogu
s
to
o
l for use
b
y tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
Ju
n
io C H
a
mano
G
i
t
1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Ju
n
io
C
Hamano
Me
r
ge b
r
anch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-12-22
David
Reiss
Prevent git blam
e
from s
e
gfaul
t
ing on
a
missing author
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio
C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-20
B
j
örn G
u
stavsson
rebas
e
-i:
abort cleanly if
the editor fails t
o
l
a
unch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
St
e
phen Boyd
technica
l
-docs: docu
m
ent h
a
sh API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-18
Stephen Boyd
api-
s
t
r
buf
.
txt: fix typos and document la
u
nch_
e
ditor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Haman
o
Gi
t
1
.
6
.
6-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
H
a
m
a
no
Merge branch 'm
a
int'
to
s
ync
wi
t
h 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
u
nio C Ha
m
ano
w
or
k
t
r
e
e
:
don't
segfault wit
h
a
n absolu
t
e
pathspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
J
eff King
ig
n
ore u
n
k
nown color
c
onfiguration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Johannes
Sixt
help
.
autocor
r
ec
t
: do not run a command
i
f
t
he
c
om
m
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-15
Na
n
ako Shiraishi
Illustrate "filter"
a
ttri
b
ute with an
exam
p
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-12
Bjö
r
n
G
ustavsson
bash
:
Support new 'git
f
etch' options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hamano
Update Rele
a
s
e Not
e
s
f
or 1
.
6
.
6
to remove old bugfixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Ha
m
ano
S
ync with
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Ju
n
io C
Hamano
Fix a
r
chive format
w
ith -- on the command l
i
ne
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remo
v
e post-uploa
d
-
hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
u
n
i
o C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
mano
Merge git:/
/
rep
o
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio
C
H
amano
Merge git://git
.
kernel
.
org/pub/scm/gi
t
k
/
gitk
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Ha
m
ano
Update dra
f
t rele
a
se notes to 1
.
6
.
6 before -rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
ma
n
o
Merge branch 'mm/ma
i
n
t
-merge-ff-error-message-fix'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch
'jn/maint-pull-rebase-
e
r
ror-message' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Hamano
Merge branch 'jk/maint-add-p-del
e
t
e
-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio
C
Hamano
Me
r
ge git://git
.
bogomips
.
org
/
git-svn
commit
|
commitdiff
|
tree
2009-12-08
J
unio C Hamano
R
e
v
ert
recent "git me
r
g
e
<msg
>
H
E
A
D
<c
o
mmit>
.
.
.
" de
p
r
e
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-08
Jeff Kin
g
add-i
n
terac
t
ive: fix
d
eletion of no
n
-emp
t
y files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-06
SZED
E
R Gábo
r
bash: update
'git com
m
it' complet
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Syn
c
w
ith 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Ju
n
io C
H
amano
Git 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Li
n
us Torvalds
F
ix diff -B/-
-
dirstat miscountin
g
of ne
w
ly added contents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
re
s
et:
i
mprove w
o
rktree safety val
v
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Todd Zullinge
r
Documenta
t
i
o
n: Avo
i
d
u
se of xm
l
to --stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
René Scha
r
fe
a
rc
h
i
v
e:
clarify d
e
scripti
o
n of path par
a
met
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-04
J
e
f
f King
r
erere: don't segfault
o
n
f
a
i
l
u
re to
open
rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C
Hamano
Prepa
r
e
f
or 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Hama
n
o
Merg
e
b
ranch 'uk/
m
a
int-shortlog-encoding
'
into mai
n
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'fc/maint-format-patch-pat
h
spec-dashes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C Hamano
Mer
g
e
b
ranch 'ap/main
t
-
m
erge-strat
e
g
y-lis
t
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
u
n
io C Hamano
Merge
b
r
a
nch 'jc/mai
n
t-
a
m-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rs
/
work-
a
round-grep-opt-
i
n
s
anity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'rj/maint-cygwin-count-o
b
ject
s
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C Hamano
Merge br
a
nch '
m
m/maint-hint-failed-merge'
into ma
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
Merge branch 'th/maint-rem
o
t
e
-update-help-string' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge branch 'rj/main
t
-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
ls/ma
i
nt
-
m
a
i
linfo-
n
o-inbody
'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Haman
o
M
e
rge branch 'm
o
/maint-
c
r
l
f-doc' into
main
t
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge bran
c
h 'th/remo
t
e-usage' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Me
r
ge branch 'pb/maint-use-custom-per
l
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Merge
br
a
nch 'm
m
/confi
g
-
p
athname-
t
i
l
de-expand' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'bc
/
grep-i-F
'
into m
a
in
t
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Merge branch 'jk/maint-br
e
ak-rename-reduce-memo
r
y
'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C
Haman
o
Merge branch 'rj/
m
aint-
s
implify-
c
ygwin-makefile
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hamano
Merge branch 'rg
/
do
c
-
w
o
rkflow' int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch
'
np/ma
i
nt-sideband-f
a
v
or-status'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
ak
u
b
Narebsk
i
g
i
tweb: Describe (possi
b
le) gitwe
b
.
js
mi
n
ification
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
i
o
C Hamano
Documentation: xmlto 0
.
0
.
18 does n
o
t
know
--stringparam
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herla
n
d
Fix crasher o
n
encou
n
tering SHA1-li
k
e non
-
n
o
te in not
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
B
r
andon Casey
t9001:
u
se older Getopt::Long b
o
olean prefix '--n
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Brandon Casey
t4
2
01: u
s
e
I
S
O8859-1 rather than
I
SO-88
5
9-1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ja
n
Krüger
p
ull: clarif
y
advice for
t
he unconfigured
e
rro
r
case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
J
u
ni
o
C
H
a
mano
Merge i
n
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ha
m
ano
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Uncondit
i
onal
l
y set man
.
ba
s
e
.
url
.
for
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
Git 1
.
6
.
6-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
H
orst H
.
v
o
n Brand
g
it-pull
.
sh:
Fix ca
l
l
to git-merge for
n
ew command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
J
u
nio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C Hamano
P
r
epare fo
r
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
mer
g
e: do not add standar
d
message
w
hen m
e
ssage is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Juni
o
C
Ha
m
ano
Do no
t
misidentify "gi
t
merge foo HEA
D
" as an
o
ld-st
y
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hama
n
o
U
p
date dr
a
f
t
r
elease notes to 1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
an
o
Merge branch 'jc
/
deprecate-o
l
d-syntax-from-mer
g
e
'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C
Ham
a
no
git-merge: a depr
e
c
a
t
ion notice of the a
n
cient
comma
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
u
nio C Hamano
Merg
e
branch 'bw/remot
e
-g
e
t
-re
f
-states-
f
ix'
commit
|
commitdiff
|
tree
2009-12-01
Ber
t
Wesarg
get_ref_st
a
tes: strdup entries and free u
t
il in stale
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Aguilar
h
el
p
: D
o
n
ot unnece
s
sarily look for a r
e
p
o
sitory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Michael J Gruber
D
ocumentation: Fix a
few i
.
e
.
/e
.
g
.
mix-ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
J
unio C
Haman
o
Merge
b
ranch 'jn/git
w
eb-blame'
commit
|
commitdiff
|
tree
2009-12-01
J
a
kub Nar
e
bski
gitweb: Ad
d
l
i
nk to other bl
a
me impleme
n
tation in blame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Jak
u
b
Nareb
s
ki
gitweb:
M
a
k
e link
i
n
g
to
actio
n
s
r
equiring
J
a
v
aScript
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-30
Juni
o
C H
a
m
ano
Merge b
r
anch 'fc/maint-format-patch-
p
athspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
H
a
m
ano
Merge
b
r
a
nch 'mm/m
a
int-
m
erge-f
f
-error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ap/m
a
int-merg
e
-strategy-list-fi
x
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'j
c
/
p
r
e
tty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Mer
g
e branch 'cc/bi
s
ect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
amano
Merge
branch '
e
m/commit-cl
a
im'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hama
n
o
Merge branch 'jc/mailinfo-r
e
move-br
a
ckets
'
commit
|
commitdiff
|
tree
2009-11-30
Junio
C
H
amano
Me
r
ge branch 'fc/send-email
-
en
v
elo
p
e'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch
'uk/main
t
-
short
l
og-e
n
coding'
commit
|
commitdiff
|
tree
next