repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/maint-merge-recursive-r-d-conflict'
2008-12-17
Mar
k
us Heid
e
lberg
do
c
/
g
it-reset: add r
e
feren
c
e to git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Markus
H
e
i
d
e
l
berg
Documen
t
ation: f
i
x description
f
or enabling h
o
oks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos
V
a
jna
git-d
a
emo
n
do
c
umentation: use {tild
e
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
gitweb: do not run "git diff" that is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio
C Ha
m
ano
GIT
1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
GIT 1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
H
ama
n
o
g
i
tw
e
b:
d
o not run "git diff" that is
P
orce
l
ain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bas
h
c
o
mple
t
ion: Sync config
v
a
r
iab
l
es with their man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Le
e
Marlow
bash completion: Sort
c
onfig
c
ompletion
variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Jun
i
o C Hamano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fast-import: clo
s
e
p
a
ck before unlinking it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Matt Kraai
gitweb: unify boole
a
n feature
subroutines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
J
o
h
an
n
e
s Schindelin
Force
t5302 to use a
s
i
ngle thread
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
H
amano
Merge branch
'
c
b
/maint-merge-r
e
cursive-fix' i
n
to
c
b
.
.
.
commit
|
commitdiff
|
tree
2008-12-15
J
u
n
io
C
Hamano
merge-recurs
i
ve:
do not cl
o
bber unt
r
ac
k
e
d worki
n
g tree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Clemens B
u
chacher
modify/del
e
te confl
i
c
t resolution overwrites u
n
t
ra
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
J
unio C Ham
a
no
page
r
: do not dup2 stderr if it
is
a
l
re
a
dy redirected
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Ju
n
i
o
C H
a
m
ano
git-show
:
d
o
no
t
segfa
u
lt when
showing a bad
t
ag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Johan
n
es Schindelin
Ge
t
rid of the last remnants
o
f GI
T
_CO
N
F
IG_LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Gavri
l
ov
Documentati
o
n
:
D
e
scribe
g
it-gui Tool
s
m
enu configu
r
ati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Y
O
N
E
T
ANI Tomokazu
g
it-fast-imp
o
r
t
possib
l
e
memory corr
u
p
t
ion pr
o
blem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-14
Nico
l
as Pitre
pack-objects: d
o
n't use t
o
o m
a
ny threads w
i
th few objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Mark
u
s
H
e
i
d
e
l
b
erg
builtin-co
m
mi
t
:
r
emove
u
nused me
s
sage vari
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio
C Hamano
M
erge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
mergetool: Don't keep temporary merge
file
s
unless
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merget
o
ol: Add prompt to con
t
i
n
ue after fail
i
ng
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Brandon Casey
git-branc
h
: dis
p
l
ay
s
ha1
on br
a
nch deletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Ji
m
Meye
r
i
ng
git-config
.
txt: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Nicol
a
s Pitre
autodetect number of CPUs by
d
e
fault w
h
en usin
g
thr
e
ads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
L
inus Torvalds
f
sck:
reduce
sta
c
k
foot
p
r
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jakub Narebski
gitweb: cache $parent_commit info in git_blame()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
M
i
k
l
os Vajn
a
Add s
u
p
p
o
r
t for a pdf version of the user
man
u
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff Ki
n
g
re
b
a
s
e: improve error messages about dirty st
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
N
i
c
o
las Pitre
make
sure pac
k
s
to be replaced a
r
e closed b
e
forehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alex
a
nder P
o
tashev
Fi
x
typo in comment
i
n builtin-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
Hamano
Fix
t
4
031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jakub Nareb
s
ki
gitwe
b
:
A
b
it of cod
e
cleanu
p
in git_blame()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
uni
o
C Ham
a
no
M
erge branc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-12-10
Jeff
K
in
g
dif
f
: respect textc
o
nv in rewrite di
f
fs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fi
x
ha
n
dling of binar
y
rewrite d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jaku
b
Narebski
g
i
tweb
:
Move 'l
i
n
eno' id from
l
ink to row
e
lement in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Document "git-reset --m
e
rge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexan
d
er Potashev
F
ix typos in d
o
cumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Ar
v
id Lun
d
git-p4: Fix regression in p4Where m
e
thod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Improve language
i
n gi
t
-merge
.
txt and related d
o
cs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
wo
r
k
arou
n
d Pyt
h
on
warnin
g
s
from Asc
i
iDoc
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borzenkov
Define
l
i
n
kgit macro in
[macros] sec
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mi
l
ler
git-svn: Make
f
ol
l
owing parents atom
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub
N
a
rebski
gitweb: Fix
b
u
g
in insert_file
(
) subro
u
tine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Ki
n
g
diff: all
o
w
t
urning on textconv explicitly
for p
l
umbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
r
eo
r
der ALLOW_TEXTCON
V
option setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Hamano
read-cache
.
c: t
y
pofix in co
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
ano
builtin-checkout
.
c
:
check error retu
r
n
f
rom read_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C Ha
m
ano
Poin
t
"stale" 1
.
6
.
0
.
5 do
c
umentation
from the main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C
Hama
n
o
Rever
t
"gi
t
-stash: use git rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Ju
n
i
o C Hamano
Updat
e
draf
t
re
l
e
a
se notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
J
un
i
o C Hamano
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
GIT
1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Matt McC
u
tchen
"git di
f
f <tre
e
>
{
3,}": d
o
not reverse order of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag: delete TAG_EDIT
M
SG
o
nly on su
c
cessful
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
Narebski
gitweb: Make pr
o
ject specific o
v
erride
f
or 'grep'
feat
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Mik
l
os Vajna
http
.
c: use
'
gi
t
_c
o
nfi
g
_st
r
ing' to ge
t
'cu
r
l_http_proxy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thoma
s
Rast
fetc
h
-pack: Avoid
memcpy(
)
w
i
th src==ds
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Update draft
r
e
lease
notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hama
n
o
Merg
e
branch
'j
c
/am-opti
o
ns'
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hama
n
o
git-am: rename apply_
o
pt_e
x
tra file to
a
p
ply-o
p
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C Hamano
Test
t
hat git-a
m
does not
l
ose
-C/-
p
/
-
-w
h
itespace
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Ha
m
ano
gi
t
-am
:
propagate
-
-3way o
p
tions as w
e
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am
:
propagate
-C<n>,
-
p
<
n
> optio
n
s as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio
C Hamano
git-a
m
-
-whitespa
c
e
: do n
o
t lose t
h
e command
l
ine
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor Ar
v
id Lund
git-p4: Fi
x
bug in p4Where
m
ethod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
A
lex R
i
esen
Report symlink fa
i
l
ur
e
s in merge-
r
ecursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Al
e
x Riesen
M
a
ke chdir failu
r
e
s visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex
R
ie
s
en
M
a
ke some of fwrite/f
c
l
ose
/
wri
t
e
/
cl
o
se failures visibl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
William Pursell
Add
'
g' command to go to a hunk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
William P
u
rsell
Add subroutine to dis
p
l
ay one
-
li
n
e summary
o
f
h
unks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
J
unio C
H
amano
Merge branch 'dm/
s
vn-remote
'
commit
|
commitdiff
|
tree
2008-12-04
Juni
o
C
H
aman
o
Me
r
ge branc
h
'
j
n/gitweb-u
t
f8'
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
add stage t
o
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
s
ubmodule: use git rev-parse
-
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
rebase: use g
i
t
rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
pull: use git rev-pars
e
-q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
M
ik
l
o
s
Vajna
los
t
-found
:
use git rev-pars
e
-q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
f
ilter-branch: use gi
t
rev-pars
e
-q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Des
k
in M
i
l
ler
git-svn:
M
a
ke
b
ranch use
c
orrect svn-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
J
unio C Ha
m
ano
Merge bran
c
h 'j
c
/rm-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-03
Juni
o
C Hamano
Install git-
s
tage in exec-path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hama
n
o
M
e
r
g
e branch 'jk/maint-commi
t
-v-strip' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2008-12-03
D
av
i
de Libenzi
xdiff:
g
ive up scann
i
ng sim
i
lar
l
ines
e
a
rly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio C
Hamano
Merge branch
'
b
c
/
maint-keep-pack'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge
branch
'
j
s
/mingw-renam
e
-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-12-03
Jak
u
b Nareb
s
k
i
gitweb:
F
ix handl
i
n
g o
f
non-ASCII characters
i
n i
n
se
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stas
h
: use git
r
ev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
J
unio C
Hamano
Merge bran
c
h '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-12-03
Johannes Sixt
t4030
-
diff-textconv: M
a
ke octal escape
s
e
quenc
e
more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Scott C
h
acon
Add a
b
uilt-in
alias for
'stage' to t
h
e '
a
d
d' command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
Lin
u
s Torvalds
Add
b
ackslash to l
i
st of 'crud' characte
r
s in re
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next