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
t6200 (fmt-merge-msg): style nitpicks
2010-08-18
J
onathan
N
ieder
t62
0
0 (f
m
t-merge-ms
g
):
s
tyle n
i
tp
i
cks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
t6010
(
m
erge-base): m
o
dernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Ni
e
der
t
7600 (
m
erg
e
): tes
t
mer
g
e
f
rom
branch
yet to be born
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han N
i
eder
t7600
(merge)
:
c
he
c
k
reflo
g
entry
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Niede
r
t7600 (merge): do not launch gi
t
k f
o
r
-
-debug
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (
m
e
r
g
e): modernize
s
t
yl
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Ni
e
der
mer
g
e: do not mistake (ancestor of) tag
for branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonatha
n
Nieder
t/RE
A
DME: correct an ex
c
ep
t
ion when bre
a
king a && ch
a
in
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
o
nathan Nieder
Add a sample user for
the svndump library
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
onat
h
an Nie
d
er
D
o
cu
m
entation
:
add submodule
.
* to the big
c
onfiguratio
n
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodules
.
5: url can
b
e a relative
p
ath
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --paginate:
p
a
g
i
nate external commands again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan
N
ied
e
r
t30
0
0
(
l
s
-files -o): modernize st
y
le
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jon
a
than Nieder
t911
8
(git-
s
vn): prevent early failure from taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan Nieder
t/README
:
d
ocum
e
n
t
more test helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
r
evert: d
o
not
rebuild arg
v
o
n
heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Nieder
tests: local
c
onfig f
i
le should
be honore
d
fr
o
m
subdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
a
t
han
Nieder
t700
6
:
test pager configu
r
ation for
s
everal git c
o
m
m
ands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7
0
06 (pager): introduce he
l
p
er for para
m
e
t
eri
z
ed
t
es
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
Nieder
t3508 (che
r
ry-pick): future
p
roof agai
n
s
t unmer
g
ed
f
iles
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
Nieder
git
-
svn: s
t
rip off l
e
ading slashes on --trunk argume
n
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jona
t
han Nieder
add-interact
i
ve: Clarify
“
r
em
a
ining hunks i
n
the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Nie
d
er
grep: refact
o
r
g
rep_objects loop
in
t
o its o
w
n
f
unction
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonat
h
an Niede
r
Documentatio
n
/checkout: cl
a
rify descri
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
athan Nieder
rebase
-
i -p: document sho
r
tco
m
in
g
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jon
a
than Nieder
DW
I
M 'git
s
how -5' to 'git
show --do-wal
k
-5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
onathan
Nied
e
r
gitignore
.
5: Clarify matching rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Ni
e
der
rebase: improve error message when upstream argum
e
nt
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
onath
a
n Niede
r
Documentation/c
h
eckout
:
cl
a
rify descriptio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
f
sck: fi
x
bogus commit header
c
heck
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan N
i
eder
A
dd g
i
t
re
m
ote set-
b
ra
n
ches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
p
o
st-receive-
e
mail: documen
t
command-line mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
git
s
vn: a
v
oid unin
i
t
iali
z
ed var in 're
s
e
t'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan N
i
ede
r
Makefile: let
h
eader de
p
en
d
ency ch
e
ck
e
r override
C
OMPUTE_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Makefile: f
i
x
h
eader dependenc
y
chec
k
er to a
l
l
ow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
athan Nieder
Documentation/notes: nit
p
i
c
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
mentation/note
s
: clean up description of
r
e
writi
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
Document
a
tion/notes: simp
l
i
fy treatment of d
e
fault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n N
i
eder
Doc
u
mentation/
l
og: add a CONFIGU
R
ATION sec
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentat
i
on/no
t
e
s: s
i
m
p
l
i
fy treatment o
f
defaul
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nied
e
r
Documentati
o
n
/
note
s
: add configuration
s
ection
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
ath
a
n Nieder
Documen
t
ation
/
notes:
d
escri
b
e cont
e
nt of notes blobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Ni
e
der
D
ocum
e
n
t
ation/notes:
document
f
ormat
of no
t
e
s trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
che
r
r
y-pick:
d
o
n
ot dump core when
i
conv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan N
i
eder
pretty: initializ
e
new cmt_fm
t
_
map to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonath
a
n
Nieder
adap
t
request-pull t
e
sts for new pull request form
a
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jona
t
han Nieder
test-lib:
some
s
h
e
lls do not
let $? propagate into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
shortlog: Document a
n
d
test
--f
o
rma
t
option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han
N
ieder
t4
2
01 (shortlog): Test out
p
ut f
o
rmat with mul
t
ipl
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Niede
r
t4201 (shor
t
log): guard setup with test_expect_succ
e
ss
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Documentation/sh
o
rtlog: scripte
d
users
shou
l
d
not rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
onatha
n
Nie
d
er
co
m
mit --amend: cope wi
t
h missi
n
g display name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-lib: Let tests
s
pecify com
m
ands
t
o
b
e run at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck: check id
e
nt lines in commit objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
J
o
n
athan Nieder
request-pull: prot
e
ct against OPTIONS_KEEPD
A
SHDA
S
H
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Niede
r
tests for req
u
es
t
-pull
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Ni
e
de
r
Documentatio
n
/Makefile:
f
i
x
interrupted builds
of u
s
er
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "bundle --stdin"
s
e
gfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
Nieder
t5704 (bund
l
e): add t
e
s
ts for bu
n
dle --std
i
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag
-
v:
u
se RUN_G
I
T_CMD to r
u
n verify-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nath
a
n Nieder
D
ocument new "already-merged" rule for
branch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonatha
n
Nie
d
er
Add
.
depend directories to
.
gitignor
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nieder
t7006: gu
a
rd cle
a
nup with test_expect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jona
t
ha
n
Nieder
t580
0
: t
e
stgit helper requires Python
s
upport
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
t
h
an N
i
eder
t7400: clarify submodule update
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Ni
e
der
t7400: cla
r
ify 'submodule add' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t74
0
0: split
s
e
t
up
i
n
to multiple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
J
onathan Nieder
Te
a
c
h mailinf
o
%< as an alterna
t
ive scisso
r
s mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonat
h
a
n Nieder
Makefile: futur
e
-proof Cyg
w
in ver
s
ion
check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
merge-recursive: a
d
d a la
b
el for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Nieder
cher
r
y-
p
i
c
k, revert: add a label for
a
ncestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
revert: clar
i
f
y
label on conflict hu
n
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
ede
r
compat: add memp
c
p
y()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an
N
ieder
checkout -m --co
n
f
lict=diff3: add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_trees(): add ancestor l
a
bel pa
r
ameter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Ni
e
der
m
er
g
e_file(): a
d
d commen
t
explaining beh
a
vior w
r
t conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
checkou
t
--conflic
t
=di
f
f3: add a label
f
or an
c
estor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n
Nieder
ll
_
mer
g
e(): add
a
ncestor label para
m
et
e
r
for d
i
ff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
Nieder
merge-file --diff3: add a
label fo
r
a
n
cesto
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
d
l_merge():
m
ove file1 and file
2
labels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
xdl_merge(): add option
a
l ance
s
tor label to diff3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n Ni
e
d
e
r
t
e
sts: document ch
e
rry-pick behavior
i
n face of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
t
e
sts: document format o
f
conflicts f
r
o
m
checkout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
revert: fix tiny memory leak in c
h
erry-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Nieder
Ma
k
e
fil
e
: Fix occasi
o
n
al GIT-CFLAGS
b
reakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nie
d
er
M
a
kefile: Fix CDPA
T
H
problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan
N
ieder
g
i
t
k
: Don'
t
clobber "Remembe
r
th
i
s view" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
athan Nieder
gitk: Add comments to explain encode_view_o
p
ts a
n
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Niede
r
Makefile: clarif
y
definiti
o
n of TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
a
m:
r
emove
reb
a
se
-
a
p
p
ly directory befo
r
e
g
c
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan N
i
e
d
er
t
est
s
: Fix race condition
in t7006-page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t7006-pager: i
f
std
o
ut is not a terminal, make a new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
J
o
nathan
Nieder
test
s
: Add tests for automatic use of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jon
a
than Nieder
am: Fix launchin
g
of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nath
a
n Nieder
g
i
t svn
:
Fix launch
i
ng of pag
e
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
Nieder
g
it
.
1
: Clarify the behavior of the --paginate opt
i
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Ni
e
de
r
Ma
k
e 'git
v
a
r
G
IT_PAGER' al
w
ays print the con
f
igured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Nieder
F
ix 'git var' us
a
ge synops
i
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
athan
Nie
d
e
r
Mak
e
f
ile: always remove
.
depend directo
r
ies on 'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nie
d
er
M
a
kefi
l
e:
tuck
away
g
e
n
e
rated make
f
i
l
e
f
r
a
gment
s
in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next