gistfile1.txt

$ git status 
On branch drm-tip
Your branch and 'drm-tip/drm-tip' have diverged,
and have 6 and 23 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:

	modified:   arch/x86/include/asm/perf_event.h
	modified:   arch/x86/kernel/cpu/mce/therm_throt.c
	modified:   drivers/ata/libata-core.c
	modified:   drivers/usb/core/usb-acpi.c
	modified:   include/linux/device.h
	modified:   kernel/events/core.c
	modified:   kernel/locking/lockdep_internals.h
	modified:   kernel/panic.c
	modified:   kernel/softirq.c
	modified:   kernel/trace/Kconfig
	modified:   kernel/trace/trace.c
	modified:   mm/oom_kill.c
	modified:   mm/vmalloc.c
	modified:   net/sched/sch_generic.c

[lucas@ldmartin-desk drm-tip]$ git commit --no-edit --quiet
mm/vmalloc.c:182: trailing whitespace.
+>