mirror
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Commit Graph

  • fd33777b78 diff --dirstat-by-file: count changed files, not lines Heikki Orsila 2008-09-05 22:27:35 +0300
  • a6f63ae002 merge-recursive: get rid of virtual_id Miklos Vajna 2008-09-05 19:26:42 +0200
  • f22a432b15 Mention the fact that 'git annotate' is only for backward compatibility. Junio C Hamano 2008-09-05 00:29:51 -0700
  • 7ceacdffc5 "blame -c" should be compatible with "annotate" Junio C Hamano 2008-09-05 00:57:35 -0700
  • 696ee23cc1 merge-recursive: move current_{file,directory}_set to struct merge_options Miklos Vajna 2008-09-03 19:08:56 +0200
  • c7d849243a merge-recursive: move the global obuf to struct merge_options Miklos Vajna 2008-09-03 02:30:03 +0200
  • b7fa51da9b merge-recursive: get rid of the index_only global variable Miklos Vajna 2008-09-02 23:53:47 +0200
  • 80d12c23de Merge branch 'jc/maint-log-grep' Junio C Hamano 2008-09-04 22:30:44 -0700
  • a4d7d2c6db log --author/--committer: really match only with name part Junio C Hamano 2008-09-04 22:15:02 -0700
  • 95b6a2db25 Merge branch 'maint' Shawn O. Pearce 2008-09-04 21:53:06 -0700
  • ca53c3fdcf git-gui: Fix diff parsing for lines starting with "--" or "++" Shawn O. Pearce 2008-09-04 21:46:56 -0700
  • b2ca414973 git-gui: Show special diffs for complex conflict cases. Alexander Gavrilov 2008-08-31 01:05:22 +0400
  • 8056cc4f29 git-gui: Make F5 reselect a diff, if an untracked file is selected. Alexander Gavrilov 2008-08-31 01:04:10 +0400
  • 29853b9010 git-gui: Reimplement and enhance auto-selection of diffs. Alexander Gavrilov 2008-08-31 01:02:56 +0400
  • ff515d81fa git-gui: Support conflict states _U & UT. Alexander Gavrilov 2008-08-31 01:00:49 +0400
  • 48c74a58b1 git-gui: Support more merge tools. Alexander Gavrilov 2008-08-31 00:59:47 +0400
  • 617ceee653 git-gui: Don't allow staging files with conflicts. Alexander Gavrilov 2008-08-31 00:54:19 +0400
  • 7e30682ce0 git-gui: Support calling merge tools. Alexander Gavrilov 2008-08-31 00:56:51 +0400
  • 042c232535 git-gui: Support resolving conflicts via the diff context menu. Alexander Gavrilov 2008-08-31 00:55:45 +0400
  • 700e560341 git-gui: Mark forgotten strings for translation. Christian Stimming 2008-09-04 11:50:53 +0200
  • 3b3d443feb add '%d' pretty format specifier to show decoration René Scharfe 2008-09-04 23:40:03 +0200
  • cab4feb67d move load_ref_decorations() to log-tree.c and export it René Scharfe 2008-09-04 23:39:21 +0200
  • 5e9bf11c1a log: add load_ref_decorations() René Scharfe 2008-09-04 23:38:08 +0200
  • 3407a7a9e6 Fix AsciiDoc errors in merge documentation Johan Herland 2008-09-04 23:48:48 +0200
  • f88d225feb diff --cumulative is a sub-option of --dirstat Junio C Hamano 2008-09-02 17:28:59 -0700
  • 5f0bdf50c2 safe_create_leading_directories(): make it about "leading" directories Junio C Hamano 2008-09-02 14:10:15 -0700
  • ff2549dc9a bash completion: Hide more plumbing commands Petr Baudis 2008-08-26 19:11:44 +0200
  • 5033639c95 merge-recursive: move call_depth to struct merge_options Miklos Vajna 2008-09-02 23:30:09 +0200
  • 1b23adadf3 Update draft release notes for 1.6.1 Junio C Hamano 2008-09-03 16:27:59 -0700
  • 9b8ae93ad9 Merge branch 'maint' Junio C Hamano 2008-09-03 16:08:23 -0700
  • de5d560c99 Start 1.6.0.2 maintenance cycle Junio C Hamano 2008-09-03 15:39:19 -0700
  • 6a42cfe86c Merge branch 'nd/worktree' into maint Junio C Hamano 2008-09-03 15:35:37 -0700
  • 36f44a0680 Merge branch 'ho/dashless' into maint Junio C Hamano 2008-09-03 14:51:56 -0700
  • 47a528ad24 tests: use "git xyzzy" form (t7200 - t9001) Nanako Shiraishi 2008-09-03 17:59:33 +0900
  • d592b3157f tests: use "git xyzzy" form (t7000 - t7199) Nanako Shiraishi 2008-09-03 17:59:31 +0900
  • 73bae1dc46 Fix passwd(5) ref and reflect that commit doens't use commit-tree Jonas Fonseca 2008-09-03 10:50:43 +0200
  • 6b9c42b4da improve handling of sideband message display Nicolas Pitre 2008-09-03 15:13:42 -0400
  • 3604e7c5c6 tests: use "git xyzzy" form (t3600 - t6999) Nanako Shiraishi 2008-09-03 17:59:29 +0900
  • 0cb0e143ff tests: use "git xyzzy" form (t0000 - t3599) Nanako Shiraishi 2008-09-03 17:59:27 +0900
  • bea005e21b checkout: fix message when leaving detached HEAD Jeff King 2008-09-03 14:07:26 -0400
  • 44a68fd526 clone: fix creation of explicitly named target directory Clemens Buchacher 2008-09-03 20:55:55 +0200
  • 01914577ed Merge branch 'tr/filter-branch' Junio C Hamano 2008-09-02 17:47:13 -0700
  • 53b543ab82 Merge branch 'np/maint-safer-pack' Junio C Hamano 2008-09-02 17:46:48 -0700
  • f3db366770 Merge branch 'rf/man-env' Junio C Hamano 2008-09-02 17:45:41 -0700
  • 1c12b38601 Merge branch 'jc/author-nickname' Junio C Hamano 2008-09-02 17:45:28 -0700
  • 14e8607c41 Merge branch 'dp/pid-uintmax' Junio C Hamano 2008-09-02 17:45:25 -0700
  • 4afbaefffa gitweb: ref markers link to named shortlogs Giuseppe Bilotta 2008-09-02 21:47:05 +0200
  • 106db883b7 Merge branch 'maint' Junio C Hamano 2008-09-02 17:10:08 -0700
  • 5f020f7202 t5300: improve SHA1 collision test Nicolas Pitre 2008-09-02 10:22:22 -0400
  • eede9f42b5 pack-objects: don't include missing preferred base objects Nicolas Pitre 2008-09-02 10:22:21 -0400
  • a8032d1224 sha1write: don't copy full sized buffers Nicolas Pitre 2008-09-02 10:22:20 -0400
  • 59d94bc9c8 Merge branch 'np/maint-safer-pack' into np/pack Junio C Hamano 2008-09-02 17:05:44 -0700
  • db3a95459c Makefile: add merge_recursive.h to LIB_H Miklos Vajna 2008-09-03 01:49:05 +0200
  • 6eb1b43793 cherry-pick/revert: make direct internal call to merge_tree() Miklos Vajna 2008-09-02 14:11:15 -0700
  • 62e00b0a9a Improve documentation for --dirstat diff option Heikki Orsila 2008-09-01 03:50:28 +0300
  • 86521acaca Bring local clone's origin URL in line with that of a remote clone Johan Herland 2008-09-01 21:07:33 +0200
  • f733c70941 Documentation: minor cleanup in a use case in 'git stash' manual SZEDER Gábor 2008-09-02 03:45:01 +0200
  • 9da6f0fff2 Documentation: fix disappeared lines in 'git stash' manpage SZEDER Gábor 2008-09-02 03:35:24 +0200
  • d4040e0a17 Documentation: fix reference to a for-each-ref option SZEDER Gábor 2008-09-01 23:02:09 +0200
  • 961a628fdd Merge branch 'maint' Shawn O. Pearce 2008-09-01 15:39:56 -0700
  • 9dc3793166 git-gui: Fix string escaping in po2msg.sh Alexander Gavrilov 2008-08-31 01:12:26 +0400
  • 55ba8a3474 git gui: show diffs with a minimum of 1 context line Clemens Buchacher 2008-08-30 18:45:27 +0200
  • 93457cfa11 What's cooking update Junio C Hamano 2008-08-31 23:15:17 -0700
  • 70a3f89733 git-merge documentation: describe how conflict is presented Junio C Hamano 2008-08-31 20:36:32 -0700
  • eac5a40151 checkout --conflict=<style>: recreate merge in a non-default style Junio C Hamano 2008-08-31 19:32:40 -0700
  • e910ce30e4 Merge branch 'tr/rev-list-docs' into tr/filter-branch Junio C Hamano 2008-08-31 10:41:01 -0700
  • 85e7283069 cast pid_t's to uintmax_t to improve portability David Soria Parra 2008-08-31 14:09:39 +0200
  • 7f314565fe Merge branch 'maint' Junio C Hamano 2008-08-31 16:52:53 -0700
  • 9d13dec549 t6013: replace use of 'tac' with equivalent Perl Thomas Rast 2008-09-01 00:31:37 +0200
  • 1487743687 Document sendemail.envelopesender configuration Ask Bjørn Hansen 2008-08-31 13:32:43 -0700
  • e5b5c1d2cf Document clarification: gitmodules, gitattributes Gustaf Hendeby 2008-08-31 18:00:27 +0200
  • 394258190c git-add --intent-to-add (-N) Junio C Hamano 2008-08-21 01:44:53 -0700
  • f0e90716d4 Add help.autocorrect to enable/disable autocorrecting Alex Riesen 2008-08-31 15:54:58 +0200
  • 8af84dadb1 git wrapper: DWIM mistyped commands Johannes Schindelin 2008-08-31 15:50:23 +0200
  • 7e44c93558 'git foo' program identifies itself without dash in die() messages Junio C Hamano 2008-08-31 09:39:19 -0700
  • bb528633b3 setup_git_directory(): fix move to worktree toplevel directory Nguyễn Thái Ngọc Duy 2008-08-30 16:15:32 +0700
  • f83eafdd62 update-index: fix worktree setup Nguyễn Thái Ngọc Duy 2008-08-30 16:13:58 +0700
  • 1707adb7f2 config.txt: Add missing colons after option name Teemu Likonen 2008-08-29 10:29:42 +0300
  • 146ea068a0 git commit --author=$name: look $name up in existing commits Junio C Hamano 2008-08-26 23:13:13 -0700
  • a5a818ee48 diff: vary default prefix depending on what are compared Junio C Hamano 2008-08-18 20:08:09 -0700
  • 18668f5319 builtin-merge: avoid run_command_v_opt() for recursive and subtree Miklos Vajna 2008-08-28 15:43:00 +0200
  • 8a2fce1895 merge-recursive: introduce merge_options Miklos Vajna 2008-08-25 16:25:57 +0200
  • 73118f89b8 merge-recursive.c: Add more generic merge_recursive_generic() Stephan Beyer 2008-08-12 22:13:59 +0200
  • 9047ebbc22 Split out merge_recursive() to merge-recursive.c Miklos Vajna 2008-08-12 18:45:14 +0200
  • 3928097020 diff: Help "less" hide ^M from the output Junio C Hamano 2008-08-27 19:48:01 -0700
  • 7df437e56b Merge branch 'maint' Junio C Hamano 2008-08-30 20:31:39 -0700
  • bbb896d8e1 gitattributes: -crlf is not binary Junio C Hamano 2008-08-30 14:35:15 -0700
  • 0cf8581e33 checkout -m: recreate merge when checking out of unmerged index Junio C Hamano 2008-08-30 07:52:24 -0700
  • 29a1f99b4b Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution' Junio C Hamano 2008-08-30 19:44:17 -0700
  • c236bcd061 git-merge-recursive: learn to honor merge.conflictstyle Junio C Hamano 2008-08-29 10:59:16 -0700
  • b541248467 merge.conflictstyle: choose between "merge" and "diff3 -m" styles Junio C Hamano 2008-08-29 10:49:56 -0700
  • 387c9d4981 rerere: understand "diff3 -m" style conflicts with the original Junio C Hamano 2008-08-29 10:24:45 -0700
  • cc58d7dfdd rerere.c: use symbolic constants to keep track of parsing states Junio C Hamano 2008-08-29 10:12:23 -0700
  • 83133740d9 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less Junio C Hamano 2008-08-29 08:22:55 -0700
  • 838338cd22 xmerge.c: minimum readability fixups Junio C Hamano 2008-08-29 08:16:30 -0700
  • e0af48e496 xdiff-merge: optionally show conflicts in "diff3 -m" style Junio C Hamano 2008-08-28 01:10:04 -0700
  • f2b25dd81f xdl_fill_merge_buffer(): separate out a too deeply nested function Junio C Hamano 2008-08-28 01:04:00 -0700
  • 38901a4837 checkout --ours/--theirs: allow checking out one side of a conflicting merge Junio C Hamano 2008-08-30 07:48:18 -0700
  • db9410990e checkout -f: allow ignoring unmerged paths when checking out of the index Junio C Hamano 2008-08-30 07:46:55 -0700
  • 8fdcf31254 checkout: do not check out unmerged higher stages randomly Junio C Hamano 2008-08-29 13:40:36 -0700