summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2008-09-02Merge branch 'tr/filter-branch'Libravatar Junio C Hamano2-2/+99
2008-09-02Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2008-09-02t5300: improve SHA1 collision testLibravatar Nicolas Pitre1-1/+2
2008-09-01Bring local clone's origin URL in line with that of a remote cloneLibravatar Johan Herland1-3/+3
2008-08-31checkout --conflict=<style>: recreate merge in a non-default styleLibravatar Junio C Hamano1-46/+54
2008-08-31t6013: replace use of 'tac' with equivalent PerlLibravatar Thomas Rast1-2/+2
2008-08-31git-add --intent-to-add (-N)Libravatar Junio C Hamano1-0/+36
2008-08-30diff: Help "less" hide ^M from the outputLibravatar Junio C Hamano1-0/+12
2008-08-30Merge branch 'maint'Libravatar Junio C Hamano2-3/+92
2008-08-30checkout -m: recreate merge when checking out of unmerged indexLibravatar Junio C Hamano1-0/+63
2008-08-30Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Libravatar Junio C Hamano1-0/+70
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-1/+8
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleLibravatar Junio C Hamano1-0/+37
2008-08-30checkout --ours/--theirs: allow checking out one side of a conflicting mergeLibravatar Junio C Hamano1-0/+25
2008-08-30checkout -f: allow ignoring unmerged paths when checking out of the indexLibravatar Junio C Hamano1-0/+23
2008-08-30checkout: do not check out unmerged higher stages randomlyLibravatar Junio C Hamano1-0/+22
2008-08-30git-apply: Loosen "match_beginning" logicLibravatar Junio C Hamano1-3/+12
2008-08-30Merge branch 'sp/missing-thin-base' into maintLibravatar Junio C Hamano1-0/+80
2008-08-29rev-list: fix --reverse interaction with --parentsLibravatar Thomas Rast1-0/+42
2008-08-29Merge branch 'np/verify-pack' into maintLibravatar Junio C Hamano1-0/+6
2008-08-29Merge branch 'maint'Libravatar Junio C Hamano1-0/+6
2008-08-29pretty=format: respect date format optionsLibravatar Jeff King1-0/+6
2008-08-28grep: fix worktree setupLibravatar Nguyễn Thái Ngọc Duy1-0/+5
2008-08-28diff*: fix worktree setupLibravatar Nguyễn Thái Ngọc Duy1-2/+57
2008-08-27bisect: only check merge bases when neededLibravatar Christian Couder1-0/+24
2008-08-27bisect: test merge base if good rev is not an ancestor of bad revLibravatar Christian Couder1-0/+90
2008-08-27Merge branch 'mv/merge-custom'Libravatar Junio C Hamano2-0/+53
2008-08-27Merge branch 'am/cherry-pick-rerere'Libravatar Junio C Hamano1-0/+45
2008-08-27Merge branch 'np/verify-pack'Libravatar Junio C Hamano1-0/+6
2008-08-26Merge branch 'maint'Libravatar Junio C Hamano4-10/+26
2008-08-26format-patch: use default diff format even with patch optionsLibravatar Jeff King1-0/+25
2008-08-26Suppress some bash redirection error messagesLibravatar Ramsay Jones3-10/+4
2008-08-24Fix "git log -i --grep"Libravatar Jeff King1-0/+22
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Libravatar Junio C Hamano4-1/+39
2008-08-24Merge branch 'ag/maint-combine-diff-fix' into maintLibravatar Junio C Hamano1-0/+16
2008-08-23Respect core.autocrlf in combined diffLibravatar Alexander Gavrilov1-0/+16
2008-08-23t7606: fix custom merge testLibravatar Junio C Hamano1-2/+5
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano3-1/+23
2008-08-22discard revindex data when pack list changesLibravatar Nicolas Pitre1-0/+6
2008-08-22Extend "checkout --track" DWIM to support more casesLibravatar Alex Riesen1-1/+22
2008-08-21filter-branch: Grok special characters in tag namesLibravatar Johannes Sixt1-0/+8
2008-08-21test-lib: do not remove trash_directory if called with --debugLibravatar Johannes Schindelin1-1/+1
2008-08-20Merge branch 'jc/add-stop-at-symlink'Libravatar Junio C Hamano1-0/+25
2008-08-20Merge branch 'kh/diff-tree'Libravatar Junio C Hamano1-0/+14
2008-08-20Merge branch 'mg/count-objects'Libravatar Junio C Hamano1-1/+1
2008-08-20Merge branch 'cc/merge-base-many'Libravatar Junio C Hamano1-0/+48
2008-08-20Merge branch 'jc/test-deeper'Libravatar Junio C Hamano50-131/+152
2008-08-20Merge branch 'js/parallel-test'Libravatar Junio C Hamano4-7/+14
2008-08-20Merge branch 'maint'Libravatar Junio C Hamano6-0/+55
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeLibravatar Junio C Hamano1-0/+10
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 04:41:34 +0000