repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
bash: add '--merge' to 'git reset'
2008-12-13
Markus Heidelberg
built
i
n-
c
ommit
:
remove unused mess
a
ge va
r
i
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Ha
m
ano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: D
o
n't keep
t
emporary me
r
ge fi
l
es 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
nue after fa
i
ling to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Brando
n
Casey
git-branch: displ
a
y sha1 o
n
branch de
l
e
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
J
i
m Meye
r
ing
git-config
.
txt: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Nicolas Pitre
aut
o
detec
t
number of C
P
Us by defaul
t
when using thread
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
J
u
nio C
Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus To
r
va
l
ds
f
s
ck: redu
c
e
s
tack foo
t
pr
i
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
J
eff King
rebase: improv
e
err
o
r messages about dirty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pitre
make
s
u
re
p
a
cks
t
o
b
e repl
a
ced are
c
losed
b
eforehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Po
t
a
shev
Fix
typo in
com
m
e
n
t
in
b
uiltin
-
add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Fix t403
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ju
n
io
C Haman
o
Me
r
ge b
r
a
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff
:
respect textconv in
r
e
write dif
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
d
iff: f
i
x
h
andling
o
f
b
ina
r
y
rewrite
d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jun
i
o C Hamano
D
o
cument "git-r
e
s
e
t --merge"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexa
n
der Pota
s
hev
F
i
x typos in
d
ocumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lund
git-p
4
: Fix regression in p4Where me
t
hod
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf
W
il
d
enhues
Improve langua
g
e in git-merge
.
txt and related doc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
u
n
io C Haman
o
w
ork around Pytho
n
warnings from Asci
i
Doc
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 Borzenko
v
De
f
ine
li
n
kgit m
a
c
ro in [macro
s
] section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Miller
g
i
t-svn: Make
f
ollow
i
n
g
parents ato
m
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
gitweb: Fix bug in insert_fil
e
() subrouti
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Je
f
f King
diff:
allow turning on
te
x
tcon
v
e
x
plicitly for p
l
umbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
reor
d
er ALLOW_TE
X
TCONV option s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
read-ca
c
he
.
c: typofix in comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
builtin-checkou
t
.
c: check erro
r
return from read_ca
c
he()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ham
a
no
Poi
n
t "stale"
1
.
6
.
0
.
5 documentati
o
n from
the main
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Revert
"
git-stash: use
git rev-parse -
q
"
commit
|
commitdiff
|
tree
2008-12-07
J
unio C Hamano
Updat
e
draft release no
t
es fo
r
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2008-12-07
J
u
nio C Ham
a
n
o
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
M
att McCutchen
"git diff <tre
e
>{3,}": do not
reverse orde
r
of arguments
commit
|
commitdiff
|
tree
2008-12-07
J
ef
f
K
i
n
g
ta
g
: delete T
A
G_EDI
T
MSG only on su
c
cessfu
l
tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
J
a
kub
N
areb
s
ki
gitweb:
M
ake project specific
ov
e
r
r
i
de for '
g
r
ep' featur
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
htt
p
.
c: use 'git_config_strin
g
' to get 'curl_http_pro
x
y'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
T
homas
R
as
t
fetch-pack:
Avoi
d
memcpy() with src==
d
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
J
unio C Hamano
U
pdate draft
relea
s
e
notes to
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Merge br
a
nch '
j
c
/am-options'
commit
|
commitdiff
|
tree
2008-12-06
J
unio C Hamano
git-am: rename
a
p
p
l
y_opt_extra
f
ile to apply
-
opt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hama
n
o
Test that git-
a
m does n
o
t
l
o
se
-
C
/
-p/--whitespa
c
e optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio
C H
a
mano
git-am: pr
o
pagate
-
-3way op
t
i
o
ns as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C H
a
ma
n
o
git-am: propagate -
C
<n>,
-
p<n
>
options as
w
ell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C Ha
m
ano
git-am -
-
whitespa
c
e: do not lose the comm
a
nd lin
e
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
git-p
4
: Fix bug in
p
4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Report sym
l
ink f
a
ilures in merge-r
e
c
u
rsive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex
R
i
e
sen
Make chdir fai
l
ures visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex R
i
esen
Make som
e
of fwrite/fclose/write/close
f
ailures visibl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Merge b
r
anch 'dm/s
v
n
-remote
'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
M
erge branch 'j
n
/gitw
e
b-utf8'
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
add stage to gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
los
V
a
j
na
submodule: use git
r
ev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: use g
i
t rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pul
l
:
use g
i
t rev
-
parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
lost
-
found: use
g
it rev-
p
ar
s
e -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
M
ikl
o
s Vajna
fi
l
t
er-br
a
nc
h
:
u
se git rev-par
s
e -
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
De
s
kin Miller
g
it-svn: Make branc
h
use co
r
rect svn-remo
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio
C
Hamano
Merge branch 'jc/rm-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Juni
o
C H
a
mano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-03
Junio C H
a
mano
Install git
-
s
t
age in exec-path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio C
Ha
m
ano
Merge
b
ranch 'jk/main
t
-comm
i
t
-v-st
r
i
p
' into maint
commit
|
commitdiff
|
tree
2008-12-03
Davi
d
e
Lib
e
nzi
xdiff: gi
v
e up s
c
ann
i
ng si
m
il
a
r li
n
es early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Ha
m
ano
Merge branch 'bc/maint-
k
eep-pack'
into maint
commit
|
commitdiff
|
tree
2008-12-03
J
uni
o
C
H
ama
n
o
Merge bra
n
ch 'js/mingw-ren
a
me-fi
x
' into mai
n
t
commit
|
commitdiff
|
tree
2008-12-03
Jakub Na
r
ebski
git
w
e
b: Fix handl
i
ng
of no
n
-AS
C
II charac
t
ers
in inse
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
git
-
stash: use
git rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
J
u
n
i
o C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-03
Joh
a
nnes
S
ixt
t4030-diff-textconv:
M
ake octal
esca
p
e sequen
c
e m
o
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Scott Chacon
Add a b
u
ilt-in alias fo
r
'st
a
ge'
t
o
th
e
'add' comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
Linu
s
Torvalds
A
d
d backs
l
a
sh to list of 'crud' characters in real
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
J
unio C Hamano
Make
f
ile: intro
d
uc
e
NO_PTHREAD
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
Christian Couder
Docu
m
enta
t
ion:
d
escribe how to "bisect skip" a
range
.
.
.
commit
|
commitdiff
|
tree
2008-12-02
Christian C
o
uder
b
i
sect:
fix "git bisect sk
i
p <com
m
i
t
>" and a
d
d tests
.
.
.
commit
|
commitdiff
|
tree
2008-12-02
G
i
useppe B
i
lotta
Update comm
e
nt on gi
t
w
e
b_chec
k
/get_fea
t
ure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
Junio C Ha
m
ano
Merge br
a
n
c
h 'gb
/
gitweb-feature'
commit
|
commitdiff
|
tree
2008-12-02
J
un
i
o
C Hamano
M
e
rge git://repo
.
or
.
cz/git-
g
ui
commit
|
commitdiff
|
tree
2008-12-02
Junio C Hamano
Merg
e
git://
g
it
.
kernel
.
o
rg/pub
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-02
Miklos V
a
jna
U
s
er's Manu
a
l: remove duplicated url a
t
the
end of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
Linus Torvalds
Add
'
m
e
rge'
m
ode to 'git rese
t
'
commit
|
commitdiff
|
tree
2008-12-01
Junio
C
Ha
m
ano
GIT
1
.
6
.
1-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C
Hamano
Include git-gu
i
--askpass in git-gu
i
RPM packa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Jun
i
o
C
Hamano
Mer
g
e
git://git
.
kernel
.
o
rg/pub/sc
m
/gitk/gi
t
k
commit
|
commitdiff
|
tree
2008-12-01
Jun
i
o C Haman
o
M
e
rge git://repo
.
o
r
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-12-01
Junio
C
H
amano
se
n
d-email: do not rev
e
r
s
e the command line arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-12-01
Junio C H
a
mano
U
pdate d
r
aft
r
eleas
e
n
o
t
es to 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hama
n
o
Merge branch 'st/ma
i
nt-
t
ag' into
m
ain
t
commit
|
commitdiff
|
tree
2008-12-01
Junio
C Haman
o
Merge b
r
a
n
ch 'mk/m
a
int-cg-push' int
o
maint
commit
|
commitdiff
|
tree
2008-12-01
Nguyễn Thái
Ngọc Duy
generate-cmdlist
.
sh: avoid selecting synopsis
a
t wron
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Giuseppe Bi
l
o
t
ta
gitweb: make git
w
eb
_
check_
f
eature a bo
o
lean wra
p
p
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio
C Hamano
gitweb: re
n
ame gitweb_che
c
k_feature to gi
t
web
_
get_feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
gi
t
web: fix
'c
t
ags' feature
check and
others
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Juni
o
C Hamano
g
it add --intent-to-add
:
do not
let
an e
m
pty bl
o
b be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-29
Junio C Hamano
git a
d
d --intent
-
to-add: fix remo
v
a
l of cached em
p
tiness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-29
Junio C Ha
m
ano
bu
i
lt
i
n-rm
.
c: explain and cl
a
rify the "loca
l
change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-29
Junio C
H
amano
Merge branch 'nd/na
r
row' (early p
a
rt) into jc/a
d
d-i-t-a
commit
|
commitdiff
|
tree
2008-11-28
J
unio C Ha
m
ano
Merge branch 'cc/bisect-skip'
commit
|
commitdiff
|
tree
2008-11-28
Juni
o
C Hamano
Me
r
ge branch
'js
/
mingw-re
n
ame-
f
ix
'
commit
|
commitdiff
|
tree
2008-11-28
Junio
C Hamano
Merg
e
branch 'st/levens
h
tein'
commit
|
commitdiff
|
tree
next