repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Reword "your branch has diverged..." lines to reduce line length
2008-07-17
Avery Pennarun
Reword
"your
b
ranch has d
i
ver
g
e
d
.
.
.
"
lines
t
o r
e
duce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Merg
e
br
a
nc
h
'
mv/merge-in-c'
commit
|
commitdiff
|
tree
2008-07-16
Junio C
Hamano
Merge bra
n
ch 'a
g
/rewrite_one'
commit
|
commitdiff
|
tree
2008-07-16
Jun
i
o C Hamano
Merg
e
b
r
anch '
s
p/win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hamano
M
e
r
ge branch 'js/more-win'
commit
|
commitdiff
|
tree
2008-07-16
Junio C Hama
n
o
Merge branch 'js/maint-pret
t
y-mailmap'
commit
|
commitdiff
|
tree
2008-07-16
Jo
h
annes
Schin
d
elin
Rename "
.
dotest/" to
"
.
git/rebas
e
" a
n
d "
.
dotest-merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
U
p
dat
e
d
r
aft release n
o
tes to 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Johan
n
es S
c
hind
e
lin
shortlog
:
support
-
-pretty=f
o
r
mat: option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ciaran
McCreesh
Make
g
i
t-add -i a
c
c
ept ranges like 7-
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
P
a
v
el Ros
k
in
t
9
6
00
:
a
llow
testing wit
h
cvsps 2
.
2, including b
e
ta
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C H
a
mano
M
erge git:/
/
repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
ama
n
o
Mer
g
e
branch 'js/merge-rr'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
Merge branch 'sb
/
r
erere-lib'
commit
|
commitdiff
|
tree
2008-07-15
Junio
C
H
amano
Merge b
r
a
nch 'ls/maint-mailinfo-patch-label'
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hama
n
o
Merge branch 'om/rerere-ca
r
e
ful'
commit
|
commitdiff
|
tree
2008-07-15
Jun
i
o C
Hamano
Merg
e
branch 'jc/br
a
nch-merged'
commit
|
commitdiff
|
tree
2008-07-15
Junio C
Hamano
Mer
g
e bran
c
h 'jc/rebase-orig
-
head'
commit
|
commitdiff
|
tree
2008-07-15
Sha
w
n
O
.
Pearce
bash
c
ompletion: R
e
move
d
ashed
co
m
mand completi
o
n
s
upport
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
J
unio C Ha
m
ano
Merge branch
'
sp/mai
n
t-bash-
c
ompletion
-
optim
'
commit
|
commitdiff
|
tree
2008-07-15
Nicola
s
Pitre
restore legacy behav
i
or
f
o
r
r
ead_sha1_fil
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Teemu
L
ikon
e
n
bash: Add long optio
n
completion for 'g
i
t send-email
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
M
a
r
k Lev
e
dahl
git-submodule
- register sub
m
od
u
le URL i
f
a
d
ding i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Mark Levedahl
git-su
b
modu
l
e - m
a
ke "submo
d
ule add
"
m
ore str
i
ct, and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Fre
d
erik Schwarz
e
r
git
-
svn: t
y
pofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
J
o
ão Abec
a
si
s
git-svn: find-rev and rebase for SVN::Mirror repos
i
tories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Junio C Hamano
tut
o
rial: cl
a
rify "pull" is "fetch + mer
g
e"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Ian
K
atz
tutor
i
a
l
:
u
se
prompt with
u
ser name
s
in exam
p
le, to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-15
Shawn O
.
Pear
c
e
bash completion: Resolv
e
g
it
s
h
ow r
e
f:path<tab>
l
osing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Junio
C Hamano
reduc
e
_heads(
)
: pro
t
ec
t
from dupl
i
cate inpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
Jun
i
o
C
Hamano
Update draft rele
a
se notes for 1
.
6
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
S
h
awn O
.
Pe
a
rce
bash
completion
:
Append
sp
a
ce afte
r
file names have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-14
L
u
kas S
a
nds
t
r
ö
m
gi
t
-m
a
il
i
nfo:
F
ix get
t
ing th
e
subject from the
i
n
-body
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
io
C Hamano
Merge branch 'sp/mai
n
t-bash-com
p
letion-o
p
tim'
commit
|
commitdiff
|
tree
2008-07-13
Shawn O
.
Pearce
bash comple
t
ion:
Don't offer "a
.
.
" a
s
a c
o
mpletion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ramsay Jones
git-requ
e
st-pu
l
l:
r
eplace ca
l
l t
o
deprecated peek-
r
emot
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan
B
ey
e
r
Make rebase--intera
c
tive use O
P
TI
O
NS_SPE
C
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ste
p
h
a
n
B
ey
e
r
t3404: test two "prese
r
ve merges with -p" case
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
g
i
t-am/git
-
mailsp
l
it:
c
orrect
s
yn
o
psis for read
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Jun
i
o C Hamano
M
e
rge bran
c
h '
m
ai
n
t
' to sync wit
h
1
.
5
.
6
.
3
commit
|
commitdiff
|
tree
2008-07-13
Jun
i
o C Hamano
GIT 1
.
5
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Juni
o
C Hama
n
o
M
er
g
e
bran
c
h 'p
h
/parseopt-s
t
ep-blame'
commit
|
commitdiff
|
tree
2008-07-13
Junio C H
a
mano
Merg
e
branc
h
'am/
s
tash-bran
c
h
'
commit
|
commitdiff
|
tree
2008-07-13
J
u
nio C Hamano
Merg
e
br
a
nc
h
'sg/stash-k-i'
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
io C Hamano
Merge branch 'jc/report-tracking'
commit
|
commitdiff
|
tree
2008-07-13
J
un
i
o C Ham
a
no
Merg
e
branch 'j
s
/
pick-r
o
ot'
commit
|
commitdiff
|
tree
2008-07-13
Ju
n
i
o
C
Hamano
Merge branch '
a
b/bundle'
commit
|
commitdiff
|
tree
2008-07-13
Junio C Hamano
Merge
branch 'tr/a
d
d
-
i-e'
commit
|
commitdiff
|
tree
2008-07-13
S
teffen Prohaska
help (
W
i
n
dows): Displ
a
y
HTML in def
a
ult browser us
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
S
teffen Prohaska
help
.
c:
A
dd
s
u
p
po
r
t f
o
r
h
tmldir relati
v
e to gi
t
_
exec_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Ste
f
fe
n
Proha
s
ka
M
o
v
e code i
n
terpret
i
ng path relative to exec-di
r
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
S
verr
e
Hv
a
mmen
J
ohansen
reduce_heads(): thin
k
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a
new
t
est for git-merge-resolve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos
V
ajna
t6
0
21:
a
dd
a
new test fo
r
g
i
t-
m
erge-resolve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Alexander N
.
Gavrilov
Fix qu
a
dratic
p
e
r
formance in rewrite_one
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Stephan Beyer
g
i
t-am:
D
o
not
e
xit silently if
c
o
m
m
itter is
unset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Sha
w
n
O
.
Pear
c
e
bash
completion: I
m
p
r
ove resp
o
nsiveness of git-log
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-13
Johannes Schi
n
delin
Move MER
G
E_RR from
.
git/rr-cache/ i
n
to
.
git/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
Junio C Hamano
t
0
004: fix timing bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
Johannes
S
chi
n
deli
n
A
d
d pretty format %aN which
g
ives the author name,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
Mike P
a
pe
We need to
c
h
ec
k
for msys as we
l
l
as
Windows in
a
dd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
J
o
hannes Schindelin
Convert CR/
L
F to LF
i
n tag si
g
natures
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
Dmitry Kakurin
Fixed text file auto-detection: tre
a
t
EO
F
cha
r
acter
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
Lukas
S
andström
git-ma
i
lin
f
o
: documen
t
the -n option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-12
Petr
Baudis
Fix backwards-
i
nc
o
mpatible handlin
g
of c
o
re
.
shared
R
e
po
s
itory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
Juni
o
C
Haman
o
T
e
ach merge
.
lo
g
t
o
"git-me
r
ge" again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
Ste
p
h
an Beyer
rere
r
e: Separat
e
libgit and bu
i
ltin func
t
io
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
O
l
i
vier Marin
builtin-r
e
rere:
m
o
re carefully find confl
i
ct markers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-10
Ju
n
io C Hama
n
o
apply: fix
c
opy/rename breakag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Ju
n
io C Hamano
Merge branch 'jk/pager-config'
commit
|
commitdiff
|
tree
2008-07-09
Junio C Hamano
Merge br
a
nch 'js/apply-root'
commit
|
commitdiff
|
tree
2008-07-09
Junio
C
Hamano
Merge branch 'jc/reflog-expire'
commit
|
commitdiff
|
tree
2008-07-09
Robe
r
t Shearman
git-send-email: F
i
x authenticating
o
n
some servers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Pi
e
rre Ha
b
ou
z
it
revisions: refact
o
r h
a
ndle
_
revision_opt into
parse_r
e
vision_opt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Pierre Habouzit
git-shor
t
l
og: migrate to
p
a
rs
e
-op
t
i
o
ns partiall
y
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Pie
r
re Hab
o
uzit
g
i
t-blame: fi
x
lapsu
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Johannes Si
x
t
Provide fallba
c
k de
f
initions of PRIu32 and P
R
Ix3
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
R
amsay
J
ones
t9100-g
i
t-svn-basic
.
s
h
:
Fix de
t
ermina
t
i
o
n of utf-8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
R
amsay Jones
t9113-*
.
sh: provide user feedback when test skipped
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
J
u
n
io
C
Hama
n
o
Merge branch 'sp/m
a
int-pack-memuse
'
commit
|
commitdiff
|
tree
2008-07-09
Shaw
n
O
.
Pe
a
rce
C
orrect pack
memory l
e
ak causing git gc to try to e
x
ceed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Junio C Hamano
b
ranch --merged/--no-
m
e
rged: allo
w
specifying arbitrary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Ju
n
io C Hamano
b
ranch -
-
c
o
ntains: default t
o
HEAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Pie
r
re Habouzit
parse-options
:
add
P
A
R
S
E
_OPT_
L
ASTARG
_
DEFAULT flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
J
unio
C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-07-09
J
unio C Hamano
Start p
r
eparing release notes for 1
.
5
.
6
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Jun
i
o
C Hamano
Documentat
i
o
n
: u
p
d
a
te s
e
c
ti
o
n
s on
n
aming
r
e
visio
n
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Jun
i
o C
H
a
m
ano
Tone down warning about GNU I
n
ter
a
ctive Tools
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
M
ik
e
Hom
m
ey
A
v
o
id apache comp
l
aining about lack of ser
v
e
r'
s
F
QDN
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Mi
k
e Hommey
Skip t5540
-
h
ttp-push test
w
hen
U
SE_C
U
RL_MULTI is u
n
d
e
f
ined
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
M
ike Hom
m
ey
Fix http-push test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
Mike H
o
mmey
Catch failur
e
s fro
m
t5540
-
http-push
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-09
P
e
tr
Baudis
Git
.
pm: Add
r
emote_refs() gi
t
-ls-remote front
e
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Brand
o
n Casey
t7701-repack-unpack
-
unreachable
.
s
h
: check times
t
amp
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Eric Raible
compl
e
tion: add branch options
-
-con
t
ains -
-
mer
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Mar
k
Levedahl
git-s
u
bmodule -
Fix b
u
gs i
n
adding an
e
xist
i
n
g
repo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
M
a
rk
L
eveda
h
l
install-doc-quick - use git --exec-path to
find git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
SZED
E
R Gábor
b
a
sh: o
f
fer only paths
a
fter '-
-
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Pierre Habouz
i
t
git
-
blam
e
: migra
t
e to in
c
remental parse-option [2/2]
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-08
Pierre Habouzit
git-blame: migrate to incremental parse
-
option [1/2]
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next